From f4676b0378a46f739857d123692b1698d50aadaa Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Wed, 12 Jan 2011 19:00:37 +0000 Subject: [PATCH] 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 ........ --- Objects/typeobject.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Objects/typeobject.c b/Objects/typeobject.c index 84a755a181c..394b962c179 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -313,7 +313,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); @@ -334,7 +334,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; } }