From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 12 Jan 2011 15:24:27 +0000 (+0000)
Subject: move this test to test_descr; it's not abc specific
X-Git-Tag: v3.2rc1~54
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1c02a44023f6e6204d8feb944f47edfd56065e5c;p=thirdparty%2FPython%2Fcpython.git

move this test to test_descr; it's not abc specific
---

diff --git a/Lib/test/test_abc.py b/Lib/test/test_abc.py
index 52d2187b8bfa..d86f97c068c7 100644
--- a/Lib/test/test_abc.py
+++ b/Lib/test/test_abc.py
@@ -98,13 +98,6 @@ class TestABC(unittest.TestCase):
             self.assertRaises(TypeError, F)  # because bar is abstract now
             self.assertTrue(isabstract(F))
 
-    def test_type_has_no_abstractmethods(self):
-        # type pretends not to have __abstractmethods__.
-        self.assertRaises(AttributeError, getattr, type, "__abstractmethods__")
-        class meta(type):
-            pass
-        self.assertRaises(AttributeError, getattr, meta, "__abstractmethods__")
-
     def test_metaclass_abc(self):
         # Metaclasses can be ABCs, too.
         class A(metaclass=abc.ABCMeta):
diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
index 115d1e860ae6..282ec09d930d 100644
--- a/Lib/test/test_descr.py
+++ b/Lib/test/test_descr.py
@@ -4273,6 +4273,13 @@ class DictProxyTests(unittest.TestCase):
         dict_ = {k: v for k, v in self.C.__dict__.items()}
         self.assertEqual(repr(self.C.__dict__), 'dict_proxy({!r})'.format(dict_))
 
+    def test_type_has_no_abstractmethods(self):
+        # type pretends not to have __abstractmethods__.
+        self.assertRaises(AttributeError, getattr, type, "__abstractmethods__")
+        class meta(type):
+            pass
+        self.assertRaises(AttributeError, getattr, meta, "__abstractmethods__")
+
 
 class PTypesLongInitTest(unittest.TestCase):
     # This is in its own TestCase so that it can be run before any other tests.