Merged revisions 85154 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r85154 | benjamin.peterson | 2010-10-01 19:03:31 -0500 (Fri, 01 Oct 2010) | 1 line
type.__abstractmethods__ should raise an AttributeError #10006
........
diff --git a/Lib/test/test_abc.py b/Lib/test/test_abc.py
index 6a8c3a1..edd2c04 100644
--- a/Lib/test/test_abc.py
+++ b/Lib/test/test_abc.py
@@ -70,6 +70,13 @@
self.assertFalse(issubclass(OldstyleClass, A))
self.assertFalse(issubclass(A, OldstyleClass))
+ 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_isinstance_class(self):
class A:
__metaclass__ = abc.ABCMeta
diff --git a/Misc/NEWS b/Misc/NEWS
index 1fabf61..94c0ff7 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -17,6 +17,8 @@
fixes an interpreter crash when initializing an instance of a long
subclass from an object whose __long__ method returns a plain int.
+- Issue #10006: type.__abstractmethods__ now raises an AttributeError.
+
- Issue #9797: pystate.c wrongly assumed that zero couldn't be a valid
thread-local storage key.
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index d262168..9cb7e62 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -307,8 +307,11 @@
static PyObject *
type_abstractmethods(PyTypeObject *type, void *context)
{
- PyObject *mod = PyDict_GetItemString(type->tp_dict,
- "__abstractmethods__");
+ PyObject *mod = NULL;
+ /* type its self has an __abstractmethods__ descriptor (this). Don't
+ return that. */
+ if (type != &PyType_Type)
+ mod = PyDict_GetItemString(type->tp_dict, "__abstractmethods__");
if (!mod) {
PyErr_Format(PyExc_AttributeError, "__abstractmethods__");
return NULL;