Merged revisions 77789 via svnmerge from

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

........
  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/abc.py b/Lib/abc.py
index f9b49ac3d1c143b5adb8b48f8e6293b79599954f..0f980363046034c816756759b684691b087ec4e6 100644 (file)
--- a/Lib/abc.py
+++ b/Lib/abc.py
@@ -94,7 +94,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 c9deb4b96775b795db4a3073ce19b240428aef7b..a6e7062418f7a9a859c36b5d5d9fc0975d6d6d88 100644 (file)
--- a/Lib/test/test_abc.py
+++ b/Lib/test/test_abc.py
@@ -139,6 +139,12 @@ 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(metaclass=abc.ABCMeta):
+            pass
+        self.assertRaisesRegexp(TypeError, "Can only register classes",
+                                A.register, 4)
+
     def test_registration_transitiveness(self):
         class A(metaclass=abc.ABCMeta):
             pass

diff --git a/Misc/NEWS b/Misc/NEWS
index cf777df46f3a041632116bf57fad2cdce4fac6d5..1e0ae084a321a52f60020401d9c5be2aa17c56d6 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -234,6 +234,8 @@ C-API
 Library
 -------
 
+- Issue #7792: Registering non-classes to ABCs raised an obscure error.
+
 - Issue #7785: Don't accept bytes in FileIO.write().
 
 - Removed the functions 'verify' and 'vereq' from Lib/test/support.py.