From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 1 May 2012 14:16:33 +0000 (-0400)
Subject: use formats that work on 2.7
X-Git-Tag: v2.7.4rc1~859
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f3ad1f94a8d5b528d121485399adc4f50f7c2162;p=thirdparty%2FPython%2Fcpython.git

use formats that work on 2.7
---

diff --git a/Objects/descrobject.c b/Objects/descrobject.c
index 15109dbfa31b..7bf1859483b0 100644
--- a/Objects/descrobject.c
+++ b/Objects/descrobject.c
@@ -262,28 +262,27 @@ classmethoddescr_call(PyMethodDescrObject *descr, PyObject *args,
     argc = PyTuple_GET_SIZE(args);
     if (argc < 1) {
         PyErr_Format(PyExc_TypeError,
-                     "descriptor '%V' of '%.100s' "
+                     "descriptor '%s' of '%.100s' "
                      "object needs an argument",
-                     descr_name((PyDescrObject *)descr), "?",
+                     descr_name((PyDescrObject *)descr),
                      descr->d_type->tp_name);
         return NULL;
     }
     self = PyTuple_GET_ITEM(args, 0);
     if (!PyType_Check(self)) {
         PyErr_Format(PyExc_TypeError,
-                     "descriptor '%V' requires a type "
+                     "descriptor '%s' requires a type "
                      "but received a '%.100s'",
-                     descr_name((PyDescrObject *)descr), "?",
-                     descr->d_type->tp_name,
+                     descr_name((PyDescrObject *)descr),
                      self->ob_type->tp_name);
         return NULL;
     }
     if (!PyType_IsSubtype((PyTypeObject *)self, descr->d_type)) {
         PyErr_Format(PyExc_TypeError,
-                     "descriptor '%V' "
+                     "descriptor '%s' "
                      "requires a subtype of '%.100s' "
                      "but received '%.100s",
-                     descr_name((PyDescrObject *)descr), "?",
+                     descr_name((PyDescrObject *)descr),
                      descr->d_type->tp_name,
                      self->ob_type->tp_name);
         return NULL;