diff options
| author | Benjamin Peterson <benjamin@python.org> | 2012-05-01 14:16:33 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2012-05-01 14:16:33 (GMT) |
| commit | f3ad1f94a8d5b528d121485399adc4f50f7c2162 (patch) | |
| tree | 93c6afda2cf945dbc4200f5a7271803dd1b23f1e /Objects | |
| parent | 042c47b2c741dd053e2ed8b17d56659fb87576de (diff) | |
| download | cpython-f3ad1f94a8d5b528d121485399adc4f50f7c2162.zip cpython-f3ad1f94a8d5b528d121485399adc4f50f7c2162.tar.gz cpython-f3ad1f94a8d5b528d121485399adc4f50f7c2162.tar.bz2 | |
use formats that work on 2.7
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/descrobject.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Objects/descrobject.c b/Objects/descrobject.c index 15109db..7bf1859 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; |