[Python-checkins] r59809 - in python/trunk/Lib: abc.py test/test_abc.py

[jeffrey.yasskin]

Author: jeffrey.yasskin
Date: Mon Jan  7 07:09:40 2008
New Revision: 59809

Modified:
   python/trunk/Lib/abc.py
   python/trunk/Lib/test/test_abc.py
Log:
Fix issue 1747: allow classic classes to be checked for being subclasses of
ABCs.


Modified: python/trunk/Lib/abc.py
==============================================================================
--- python/trunk/Lib/abc.py	(original)
+++ python/trunk/Lib/abc.py	Mon Jan  7 07:09:40 2008
@@ -188,7 +188,7 @@
                 cls._abc_negative_cache.add(subclass)
             return ok
         # Check if it's a direct subclass
-        if cls in subclass.__mro__:
+        if cls in getattr(subclass, '__mro__', ()):
             cls._abc_cache.add(subclass)
             return True
         # Check if it's a subclass of a registered class (recursive)

Modified: python/trunk/Lib/test/test_abc.py
==============================================================================
--- python/trunk/Lib/test/test_abc.py	(original)
+++ python/trunk/Lib/test/test_abc.py	Mon Jan  7 07:09:40 2008
@@ -8,7 +8,6 @@
 from test import test_support
 
 import abc
-__metaclass__ = type
 
 
 class TestABC(unittest.TestCase):
@@ -59,10 +58,18 @@
             self.assertEqual(F.__abstractmethods__, set(["bar"]))
             self.assertRaises(TypeError, F)  # because bar is abstract now
 
+    def test_subclass_oldstyle_class(self):
+        class A:
+            __metaclass__ = abc.ABCMeta
+        class OldstyleClass:
+            pass
+        self.assertFalse(issubclass(OldstyleClass, A))
+        self.assertFalse(issubclass(A, OldstyleClass))
+
     def test_registration_basics(self):
         class A:
             __metaclass__ = abc.ABCMeta
-        class B:
+        class B(object):
             pass
         b = B()
         self.assertEqual(issubclass(B, A), False)
@@ -95,7 +102,7 @@
         class A1(A):
             pass
         self.assertRaises(RuntimeError, A1.register, A)  # cycles not allowed
-        class B:
+        class B(object):
             pass
         A1.register(B)  # ok
         A1.register(B)  # should pass silently
@@ -136,7 +143,7 @@
     def test_all_new_methods_are_called(self):
         class A:
             __metaclass__ = abc.ABCMeta
-        class B:
+        class B(object):
             counter = 0
             def __new__(cls):
                 B.counter += 1