mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-02 03:01:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Merged revisions 85154,85182 via svnmerge from

Browse source 
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
........
  r85182 | benjamin.peterson | 2010-10-02 12:55:47 -0500 (Sat, 02 Oct 2010) | 1 line

  add a test and a note about metaclasses now being abcs
........
This commit is contained in:
Benjamin Peterson 2010-10-02 18:04:55 +00:00
parent 7f8199a997
commit 0ad44fa3f7
3 changed files with 28 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Objects/typeobject.c
View file

@ -320,8 +320,11 @@ type_set_module(PyTypeObject *type, PyObject *value, void *context)
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;