revert r77790. it requires a new-style class change

This commit is contained in:
Benjamin Peterson 2010-01-28 01:31:13 +00:00
parent ca5a06aaa9
commit c760e86184
4 changed files with 2 additions and 9 deletions

View File

@ -1,6 +1,6 @@
"""A more or less complete user-defined wrapper around dictionary objects."""
class UserDict(object):
class UserDict:
def __init__(self, dict=None, **kwargs):
self.data = {}
if dict is not None:

View File

@ -96,7 +96,7 @@ class ABCMeta(type):
def register(cls, subclass):
"""Register a virtual subclass of an ABC."""
if not isinstance(subclass, type):
if not isinstance(cls, type):
raise TypeError("Can only register classes")
if issubclass(subclass, cls):
return # Already a subclass

View File

@ -149,11 +149,6 @@ 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

View File

@ -58,8 +58,6 @@ Library
file position to the given argument, which goes against the tradition of
ftruncate() and other truncation APIs. Patch by Pascal Chambon.
- 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.