From f3ad1f94a8d5b528d121485399adc4f50f7c2162 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Tue, 1 May 2012 10:16:33 -0400 Subject: [PATCH] use formats that work on 2.7 --- Objects/descrobject.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Objects/descrobject.c b/Objects/descrobject.c index 15109dbfa3..7bf1859483 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; -- 2.50.1