diff options
| author | Andrew M. Kuchling <amk@amk.ca> | 2000-12-15 13:07:46 (GMT) |
|---|---|---|
| committer | Andrew M. Kuchling <amk@amk.ca> | 2000-12-15 13:07:46 (GMT) |
| commit | 6ca8917758c90bb8de4d3698f9c6ba84167035f5 (patch) | |
| tree | b2435c85b827e303c3c2793aa0be46cec2a650be | |
| parent | 29c45a5e91e3fc2e35fdfaf75ee58f2a204e84ce (diff) | |
| download | cpython-6ca8917758c90bb8de4d3698f9c6ba84167035f5.zip cpython-6ca8917758c90bb8de4d3698f9c6ba84167035f5.tar.gz cpython-6ca8917758c90bb8de4d3698f9c6ba84167035f5.tar.bz2 | |
[ Patch #102852 ] Make % error a bit more informative by indicates the
index at which an unknown %-escape was found
| -rw-r--r-- | Objects/stringobject.c | 5 | ||||
| -rw-r--r-- | Objects/unicodeobject.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/Objects/stringobject.c b/Objects/stringobject.c index 8bc97f7..091ede7 100644 --- a/Objects/stringobject.c +++ b/Objects/stringobject.c @@ -2939,8 +2939,9 @@ PyString_Format(PyObject *format, PyObject *args) break; default: PyErr_Format(PyExc_ValueError, - "unsupported format character '%c' (0x%x)", - c, c); + "unsupported format character '%c' (0x%x) " + "at index %i", + c, c, fmt - 1 - PyString_AsString(format)); goto error; } if (sign) { diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index a297cac..5ee72bd 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -5067,8 +5067,9 @@ PyObject *PyUnicode_Format(PyObject *format, default: PyErr_Format(PyExc_ValueError, - "unsupported format character '%c' (0x%x)", - c, c); + "unsupported format character '%c' (0x%x) " + "at index %i", + c, c, fmt -1 - PyUnicode_AS_UNICODE(uformat)); goto onError; } if (sign) { |