Author: christian.heimes
Date: Fri Nov 30 15:32:41 2007
New Revision: 59233
Modified:
python/branches/py3k/Lib/abc.py
python/branches/py3k/Lib/test/test_abc.py
Log:
Fix for bug #1109
Warning required when calling register() on an ABCMeta subclass.
Modified: python/branches/py3k/Lib/abc.py
==============================================================================
--- python/branches/py3k/Lib/abc.py (original)
+++ python/branches/py3k/Lib/abc.py Fri Nov 30 15:32:41 2007
@@ -137,8 +137,11 @@
cls._abc_negative_cache_version = ABCMeta._abc_invalidation_counter
return cls
- def register(cls, subclass):
+ def register(cls, subclass=None):
"""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 15:32:41 2007
@@ -146,6 +146,13 @@
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)
_______________________________________________
Python-3000-checkins mailing list
[email protected]
http://mail.python.org/mailman/listinfo/python-3000-checkins
