Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-30 21:21:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Issue #26198: Fixed error messages for some argument parsing errors.

Browse source
This commit is contained in:
Serhiy Storchaka 2016-02-08 01:20:21 +02:00
commit 3e17c788a8
2 changed files with 21 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/test/test_capi.py
View file

@ -489,7 +489,7 @@ def test_skipitem(self):
format.encode("ascii"), keywords) format.encode("ascii"), keywords)
when_not_skipped = False when_not_skipped = False
except TypeError as e: except TypeError as e:
s = "argument 1 must be impossible<bad format char>, not int" s = "argument 1 (impossible<bad format char>)"
when_not_skipped = (str(e) == s) when_not_skipped = (str(e) == s)
except RuntimeError as e: except RuntimeError as e:
when_not_skipped = False when_not_skipped = False

32
Python/getargs.c
View file

@ -342,7 +342,7 @@ vgetargs1(PyObject *args, const char *format, va_list *p_va, int flags)
flags, levels, msgbuf, flags, levels, msgbuf,
sizeof(msgbuf), &freelist); sizeof(msgbuf), &freelist);
if (msg) { if (msg) {
seterror(i+1, msg, levels, fname, msg); seterror(i+1, msg, levels, fname, message);
return cleanreturn(0, &freelist); return cleanreturn(0, &freelist);
} }
} }
@ -535,9 +535,15 @@ converterr(const char *expected, PyObject *arg, char *msgbuf, size_t bufsize)
{ {
assert(expected != NULL); assert(expected != NULL);
assert(arg != NULL); assert(arg != NULL);
PyOS_snprintf(msgbuf, bufsize, if (expected[0] == '(') {
"must be %.50s, not %.50s", expected, PyOS_snprintf(msgbuf, bufsize,
arg == Py_None ? "None" : arg->ob_type->tp_name); "%.100s", expected);
}
else {
PyOS_snprintf(msgbuf, bufsize,
"must be %.50s, not %.50s", expected,
arg == Py_None ? "None" : arg->ob_type->tp_name);
}
return msgbuf; return msgbuf;
} }
@ -741,7 +747,7 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
if (PyLong_Check(arg)) if (PyLong_Check(arg))
ival = PyLong_AsUnsignedLongMask(arg); ival = PyLong_AsUnsignedLongMask(arg);
else else
return converterr("integer<k>", arg, msgbuf, bufsize); return converterr("int", arg, msgbuf, bufsize);
*p = ival; *p = ival;
break; break;
} }
@ -766,7 +772,7 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
if (PyLong_Check(arg)) if (PyLong_Check(arg))
ival = PyLong_AsUnsignedLongLongMask(arg); ival = PyLong_AsUnsignedLongLongMask(arg);
else else
return converterr("integer<K>", arg, msgbuf, bufsize); return converterr("int", arg, msgbuf, bufsize);
*p = ival; *p = ival;
break; break;
} }
@ -1123,9 +1129,11 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
} else { } else {
if (size + 1 > BUFFER_LEN) { if (size + 1 > BUFFER_LEN) {
Py_DECREF(s); Py_DECREF(s);
return converterr( PyErr_Format(PyExc_TypeError,
"(buffer overflow)", "encoded string too long "
arg, msgbuf, bufsize); "(%zd, maximum length %zd)",
(Py_ssize_t)size, (Py_ssize_t)(BUFFER_LEN-1));
RETURN_ERR_OCCURRED;
} }
} }
memcpy(*buffer, ptr, size+1); memcpy(*buffer, ptr, size+1);
@ -1147,7 +1155,7 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
if ((Py_ssize_t)strlen(ptr) != size) { if ((Py_ssize_t)strlen(ptr) != size) {
Py_DECREF(s); Py_DECREF(s);
return converterr( return converterr(
"encoded string without NULL bytes", "encoded string without null bytes",
arg, msgbuf, bufsize); arg, msgbuf, bufsize);
} }
*buffer = PyMem_NEW(char, size + 1); *buffer = PyMem_NEW(char, size + 1);
@ -1237,7 +1245,7 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
if (*format != '*') if (*format != '*')
return converterr( return converterr(
"invalid use of 'w' format character", "(invalid use of 'w' format character)",
arg, msgbuf, bufsize); arg, msgbuf, bufsize);
format++; format++;
@ -1261,7 +1269,7 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
} }
default: default:
return converterr("impossible<bad format char>", arg, msgbuf, bufsize); return converterr("(impossible<bad format char>)", arg, msgbuf, bufsize);
} }