diff options
| author | Benjamin Peterson <benjamin@python.org> | 2011-01-12 19:02:36 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2011-01-12 19:02:36 (GMT) |
| commit | a53d2acb3d14ff497d8f28efcec2c5567a8426c4 (patch) | |
| tree | 98daccfd4d3e0b24c578f4535260b25944de8b11 /Objects | |
| parent | b633eab98e53dbbdb0c0d019e77d409b9b0adf58 (diff) | |
| download | cpython-a53d2acb3d14ff497d8f28efcec2c5567a8426c4.zip cpython-a53d2acb3d14ff497d8f28efcec2c5567a8426c4.tar.gz cpython-a53d2acb3d14ff497d8f28efcec2c5567a8426c4.tar.bz2 | |
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
........
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/typeobject.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Objects/typeobject.c b/Objects/typeobject.c index 6a325e8..7a82393 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -326,7 +326,7 @@ type_abstractmethods(PyTypeObject *type, void *context) if (type != &PyType_Type) mod = PyDict_GetItemString(type->tp_dict, "__abstractmethods__"); if (!mod) { - PyErr_Format(PyExc_AttributeError, "__abstractmethods__"); + PyErr_SetString(PyExc_AttributeError, "__abstractmethods__"); return NULL; } Py_XINCREF(mod); @@ -347,7 +347,7 @@ type_set_abstractmethods(PyTypeObject *type, PyObject *value, void *context) else { res = PyDict_DelItemString(type->tp_dict, "__abstractmethods__"); if (res && PyErr_ExceptionMatches(PyExc_KeyError)) { - PyErr_Format(PyExc_AttributeError, "__abstractmethods__", value); + PyErr_SetString(PyExc_AttributeError, "__abstractmethods__"); return -1; } } |