diff options
| -rw-r--r-- | Lib/abc.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_abc.py | 6 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
3 files changed, 9 insertions, 1 deletions
@@ -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 c3482d6..51fd9bb 100644 --- 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 @@ -73,6 +73,8 @@ Core and Builtins Library ------- +- Issue #7792: Registering non-classes to ABCs raised an obscure error. + - Issue #7785: Don't accept bytes in FileIO.write(). - Issue #7773: Fix an UnboundLocalError in platform.linux_distribution() when |