revert r77790. it requires a new-style class change

3 files changed, 2 insertions, 7 deletions

diff --git a/Lib/UserDict.py b/Lib/UserDict.py
index df5f7fb..0d9591a 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(object):
+class UserDict:
     def __init__(self, dict=None, **kwargs):
         self.data = {}
         if dict is not None:
diff --git a/Lib/abc.py b/Lib/abc.py
index 8aeb2af..95126d8 100644
--- 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(subclass, type):
+        if not isinstance(cls, 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 fa20173..3e0955f 100644
--- a/Lib/test/test_abc.py
+++ b/Lib/test/test_abc.py
@@ -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