#18581: merge with 3.3.

ezio-melotti · ezio-melotti · commit e1a6edcebe32 · 2013-08-08T19:37:52.000+03:00
diff --git a/Lib/test/test_abc.py b/Lib/test/test_abc.py
@@ -65,34 +65,6 @@ def foo(): return 4
         self.assertEqual(D.foo(), 4)
         self.assertEqual(D().foo(), 4)
 
-    def test_abstractmethod_integration(self):
-        for abstractthing in [abc.abstractmethod, abc.abstractproperty,
-                              abc.abstractclassmethod,
-                              abc.abstractstaticmethod]:
-            class C(metaclass=abc.ABCMeta):
-                @abstractthing
-                def foo(self): pass  # abstract
-                def bar(self): pass  # concrete
-            self.assertEqual(C.__abstractmethods__, {"foo"})
-            self.assertRaises(TypeError, C)  # because foo is abstract
-            self.assertTrue(isabstract(C))
-            class D(C):
-                def bar(self): pass  # concrete override of concrete
-            self.assertEqual(D.__abstractmethods__, {"foo"})
-            self.assertRaises(TypeError, D)  # because foo is still abstract
-            self.assertTrue(isabstract(D))
-            class E(D):
-                def foo(self): pass
-            self.assertEqual(E.__abstractmethods__, set())
-            E()  # now foo is concrete, too
-            self.assertFalse(isabstract(E))
-            class F(E):
-                @abstractthing
-                def bar(self): pass  # abstract override of concrete
-            self.assertEqual(F.__abstractmethods__, {"bar"})
-            self.assertRaises(TypeError, F)  # because bar is abstract now
-            self.assertTrue(isabstract(F))
-
 
 class TestABC(unittest.TestCase):
 
@@ -432,9 +404,5 @@ class C(A, B):
         self.assertEqual(B.counter, 1)
 
 
-def test_main():
-    support.run_unittest(TestABC)
-
-
 if __name__ == "__main__":
     unittest.main()
