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

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 529f3e69af11de51e8bc832a68eef2bd25abd5ab..31f1986ae2474fad755728529f541a5a3f062302 100644 (file)
--- a/Lib/test/test_abc.py
+++ b/Lib/test/test_abc.py
@@ -149,6 +149,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(object):
+            __metaclass__ = abc.ABCMeta
+        self.assertRaisesRegexp(TypeError, "Can only register classes",
+                                A.register, 4)
+
     def test_registration_transitiveness(self):
         class A:
             __metaclass__ = abc.ABCMeta

diff --git a/Misc/NEWS b/Misc/NEWS
index 9ffd3e40595130a50b0ea96ef283e6153bb5aeb8..ac1295af90e3298ecbe1ebd26cc4a3f9b69c039f 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -47,6 +47,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #7792: Registering non-classes to ABCs raised an obscure error.
+
 - Removed the functions 'verify' and 'vereq' from Lib/test/test_support.py.
 
 - Issue #7773: Fix an UnboundLocalError in platform.linux_distribution() when