Merged revisions 87960 via svnmerge from

benjaminp · benjaminp · commit a53d2acb3d14 · 2011-01-12T19:02:36.000Z
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
........
diff --git 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;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -326,7 +326,7 @@ type_abstractmethods(PyTypeObject type, void context)`
`326`	`326`	`if (type != &PyType_Type)`
`327`	`327`	`mod = PyDict_GetItemString(type->tp_dict, "__abstractmethods__");`
`328`	`328`	`if (!mod) {`
`329`		`- PyErr_Format(PyExc_AttributeError, "__abstractmethods__");`
	`329`	`+ PyErr_SetString(PyExc_AttributeError, "__abstractmethods__");`
`330`	`330`	`return NULL;`
`331`	`331`	`}`
`332`	`332`	`Py_XINCREF(mod);`
`@@ -347,7 +347,7 @@ type_set_abstractmethods(PyTypeObject type, PyObject value, void *context)`
`347`	`347`	`else {`
`348`	`348`	`res = PyDict_DelItemString(type->tp_dict, "__abstractmethods__");`
`349`	`349`	`if (res && PyErr_ExceptionMatches(PyExc_KeyError)) {`
`350`		`- PyErr_Format(PyExc_AttributeError, "__abstractmethods__", value);`
	`350`	`+ PyErr_SetString(PyExc_AttributeError, "__abstractmethods__");`
`351`	`351`	`return -1;`
`352`	`352`	`}`
`353`	`353`	`}`