Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merged revisions 87960 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r87960 | benjamin.peterson | 2011-01-12 12:56:07 -0600 (Wed, 12 Jan 2011) | 1 line

  use PyErr_SetString instead of PyErr_Format
........
This commit is contained in:
Benjamin Peterson 2011-01-12 19:02:36 +00:00
parent b633eab98e
commit a53d2acb3d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Objects/typeobject.c
View File

@ -326,7 +326,7 @@ type_abstractmethods(PyTypeObject *type, void *context)
if (type != &PyType_Type) if (type != &PyType_Type)
mod = PyDict_GetItemString(type->tp_dict, "__abstractmethods__"); mod = PyDict_GetItemString(type->tp_dict, "__abstractmethods__");
if (!mod) { if (!mod) {
PyErr_Format(PyExc_AttributeError, "__abstractmethods__"); PyErr_SetString(PyExc_AttributeError, "__abstractmethods__");
return NULL; return NULL;
} }
Py_XINCREF(mod); Py_XINCREF(mod);
@ -347,7 +347,7 @@ type_set_abstractmethods(PyTypeObject *type, PyObject *value, void *context)
else { else {
res = PyDict_DelItemString(type->tp_dict, "__abstractmethods__"); res = PyDict_DelItemString(type->tp_dict, "__abstractmethods__");
if (res && PyErr_ExceptionMatches(PyExc_KeyError)) { if (res && PyErr_ExceptionMatches(PyExc_KeyError)) {
PyErr_Format(PyExc_AttributeError, "__abstractmethods__", value); PyErr_SetString(PyExc_AttributeError, "__abstractmethods__");
return -1; return -1;
} }
} }