[Python-checkins] r87962 - in python/branches/release27-maint: Objects/typeobject.c

[benjamin.peterson]

Author: benjamin.peterson
Date: Wed Jan 12 20:00:37 2011
New Revision: 87962

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


Modified:
   python/branches/release27-maint/   (props changed)
   python/branches/release27-maint/Objects/typeobject.c

Modified: python/branches/release27-maint/Objects/typeobject.c
==============================================================================
--- python/branches/release27-maint/Objects/typeobject.c	(original)
+++ python/branches/release27-maint/Objects/typeobject.c	Wed Jan 12 20:00:37 2011
@@ -313,7 +313,7 @@
     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 @@
     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;
         }
     }