From 8052f8921e569c5c7c9afff6dc973dde9ec8f2e5 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Wed, 9 Oct 2002 19:14:30 +0000 Subject: [PATCH] Undo this part of the previous checkin: Also fixed an error message -- %s argument has non-string str() doesn't make sense for %r, so the error message now differentiates between %s and %r. because PyObject_Repr() and PyObject_Str() ensure that this can never happen. Added a helpful comment instead. --- Objects/stringobject.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Objects/stringobject.c b/Objects/stringobject.c index 52f96ff07f8..6a9450a21d9 100644 --- a/Objects/stringobject.c +++ b/Objects/stringobject.c @@ -3874,10 +3874,11 @@ PyString_Format(PyObject *format, PyObject *args) if (temp == NULL) goto error; if (!PyString_Check(temp)) { + /* XXX Note: this should never happen, + since PyObject_Repr() and + PyObject_Str() assure this */ PyErr_SetString(PyExc_TypeError, - c == 's' ? - "%s argument has non-string str()" : - "%r argument has non-string repr()"); + "%s argument has non-string str()"); Py_DECREF(temp); goto error; }