diff options
| author | Benjamin Peterson <benjamin@python.org> | 2011-01-12 15:42:34 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2011-01-12 15:42:34 (GMT) |
| commit | de368717dad90577e4f491d3f4187742a7d00515 (patch) | |
| tree | 4edbbd20931fba6e432f183c3d8ee4a5d69472c1 /Objects | |
| parent | 6e1d0a829ddd4db0b099878f820d36f5e32a0f03 (diff) | |
| download | cpython-de368717dad90577e4f491d3f4187742a7d00515.zip cpython-de368717dad90577e4f491d3f4187742a7d00515.tar.gz cpython-de368717dad90577e4f491d3f4187742a7d00515.tar.bz2 | |
Merged revisions 87952-87954 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r87952 | benjamin.peterson | 2011-01-12 09:24:27 -0600 (Wed, 12 Jan 2011) | 1 line
move this test to test_descr; it's not abc specific
........
r87953 | benjamin.peterson | 2011-01-12 09:25:02 -0600 (Wed, 12 Jan 2011) | 1 line
oops, wrong class
........
r87954 | benjamin.peterson | 2011-01-12 09:34:01 -0600 (Wed, 12 Jan 2011) | 1 line
don't segfault on deleting __abstractmethods__ #10892
........
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/typeobject.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/Objects/typeobject.c b/Objects/typeobject.c index c28d036..6a325e8 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -340,8 +340,17 @@ type_set_abstractmethods(PyTypeObject *type, PyObject *value, void *context) abc.ABCMeta.__new__, so this function doesn't do anything special to update subclasses. */ - int res = PyDict_SetItemString(type->tp_dict, - "__abstractmethods__", value); + int res; + if (value != NULL) { + res = PyDict_SetItemString(type->tp_dict, "__abstractmethods__", value); + } + else { + res = PyDict_DelItemString(type->tp_dict, "__abstractmethods__"); + if (res && PyErr_ExceptionMatches(PyExc_KeyError)) { + PyErr_Format(PyExc_AttributeError, "__abstractmethods__", value); + return -1; + } + } if (res == 0) { PyType_Modified(type); if (value && PyObject_IsTrue(value)) { |