Rooba
/
cpython
mirror of https://github.com/python/cpython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Guido van Rossum 2002-10-09 19:14:30 +00:00
parent b00c07f038
commit 8052f8921e
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Objects/stringobject.c
View File

@ -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;
}