Merged revisions 77788-77789 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77788 | benjamin.peterson | 2010-01-26 20:15:28 -0600 (Tue, 26 Jan 2010) | 1 line

  for UserDict to be compatible with abcs, it must subclass object
........
  r77789 | benjamin.peterson | 2010-01-26 20:16:42 -0600 (Tue, 26 Jan 2010) | 1 line

  raise a clear TypeError when trying to register a non-class
........

diff --git a/Lib/UserDict.py b/Lib/UserDict.py
index 0d9591a96675f3a745d3f42cbe035aaa30da418d..df5f7fbe49e16c466246abf6febc33e6f7663f2b 100644 (file)
--- a/Lib/UserDict.py
+++ b/Lib/UserDict.py
@@ -1,6 +1,6 @@
 """A more or less complete user-defined wrapper around dictionary objects."""
 
-class UserDict:
+class UserDict(object):
     def __init__(self, dict=None, **kwargs):
         self.data = {}
         if dict is not None:

diff --git a/Lib/abc.py b/Lib/abc.py
index 95126d8a18ae3d534491172db863cc8bd4c9ed01..8aeb2af616955893d0043fe28f8a9f857bcfd866 100644 (file)
--- a/Lib/abc.py
+++ b/Lib/abc.py
@@ -96,7 +96,7 @@ class ABCMeta(type):
 
     def register(cls, subclass):
         """Register a virtual subclass of an ABC."""
-        if not isinstance(cls, type):
+        if not isinstance(subclass, type):
             raise TypeError("Can only register classes")
         if issubclass(subclass, cls):
             return  # Already a subclass

diff --git a/Lib/test/test_abc.py b/Lib/test/test_abc.py
index 3e0955fd75ffcb6d009ae6c1a89db1d10641d5ea..fa20173df1eb526caa8eb1da38a1c4ed980de670 100644 (file)
--- a/Lib/test/test_abc.py
+++ b/Lib/test/test_abc.py
@@ -149,6 +149,11 @@ class TestABC(unittest.TestCase):
         self.assertRaises(RuntimeError, C.register, A)  # cycles not allowed
         C.register(B)  # ok
 
+    def test_register_non_class(self):
+        class A(object):
+            __metaclass__ = abc.ABCMeta
+        self.assertRaises(TypeError, A.register, 4)
+
     def test_registration_transitiveness(self):
         class A:
             __metaclass__ = abc.ABCMeta

diff --git a/Misc/NEWS b/Misc/NEWS
index 14e2be93b4de6490c48e713535733f6e3107e571..e2b45498667f38ac9c97d2cabf7522a9ec6b136a 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -53,6 +53,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #7792: Registering non-classes to ABCs raised an obscure error.
+
 - Issue #7773: Fix an UnboundLocalError in platform.linux_distribution() when
   the release file is empty.