diff options
| -rw-r--r-- | Lib/UserDict.py | 2 | ||||
| -rw-r--r-- | Lib/abc.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_abc.py | 5 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
4 files changed, 9 insertions, 2 deletions
diff --git a/Lib/UserDict.py b/Lib/UserDict.py index 0d9591a..df5f7fb 100644 --- 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: @@ -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 3e0955f..fa20173 100644 --- 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 @@ -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. |