summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Objects/stringobject.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/Objects/stringobject.c b/Objects/stringobject.c
index 52f96ff..6a9450a 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;
}