From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 12 Jan 2011 19:02:36 +0000 (+0000)
Subject: Merged revisions 87960 via svnmerge from
X-Git-Tag: v3.2.1b1~347^2~73
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a53d2acb3d14ff497d8f28efcec2c5567a8426c4;p=thirdparty%2FPython%2Fcpython.git

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
........
---

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 6a325e823c01..7a823933568b 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;
         }
     }