[Python-3000-checkins] r59236 - in python/branches/py3k/Lib: abc.py test/test_abc.py

[christian.heimes]

Author: christian.heimes
Date: Fri Nov 30 16:13:13 2007
New Revision: 59236

Modified:
   python/branches/py3k/Lib/abc.py
   python/branches/py3k/Lib/test/test_abc.py
Log:
Backmerge -r59233:59232
Guido said:
Please roll this back.  The error message you added is inappropriate
when the parameter to a legitimate register() call is omitted, e.g.

collections.Sequence.register()

Modified: python/branches/py3k/Lib/abc.py
==============================================================================
--- python/branches/py3k/Lib/abc.py	(original)
+++ python/branches/py3k/Lib/abc.py	Fri Nov 30 16:13:13 2007
@@ -137,11 +137,8 @@
         cls._abc_negative_cache_version = ABCMeta._abc_invalidation_counter
         return cls
 
-    def register(cls, subclass=None):
+    def register(cls, subclass):
         """Register a virtual subclass of an ABC."""
-        if subclass is None:
-            raise TypeError("register() cannot be called on an ABCMeta "
-                "subclass, use class Example(metaclass=abc.ABCMeta) instead.")
         if not isinstance(cls, type):
             raise TypeError("Can only register classes")
         if issubclass(subclass, cls):

Modified: python/branches/py3k/Lib/test/test_abc.py
==============================================================================
--- python/branches/py3k/Lib/test/test_abc.py	(original)
+++ python/branches/py3k/Lib/test/test_abc.py	Fri Nov 30 16:13:13 2007
@@ -146,13 +146,6 @@
         C()
         self.assertEqual(B.counter, 1)
 
-    def test_error_on_subclass(self):
-        class A(abc.ABCMeta):
-            pass
-        class B:
-            pass
-        self.assertRaises(TypeError, A.register, B)
-
 
 def test_main():
     test_support.run_unittest(TestABC)