diff options
| author | Sean Reifscheider <jafo@tummy.com> | 2009-08-01 23:55:06 (GMT) |
|---|---|---|
| committer | Sean Reifscheider <jafo@tummy.com> | 2009-08-01 23:55:06 (GMT) |
| commit | 642d96a6476199840502a1e98d4902f7f4d47e78 (patch) | |
| tree | f93720ffaad0e035790a184835493049a23cf48a | |
| parent | beddd709b291e60c099551345e480424a5991e2d (diff) | |
| download | cpython-642d96a6476199840502a1e98d4902f7f4d47e78.zip cpython-642d96a6476199840502a1e98d4902f7f4d47e78.tar.gz cpython-642d96a6476199840502a1e98d4902f7f4d47e78.tar.bz2 | |
- Issue #6624: yArg_ParseTuple with "s" format when parsing argument with
NUL: Bogus TypeError detail string.
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Python/getargs.c | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -1483,6 +1483,9 @@ Build C-API ----- +- Issue #6624: yArg_ParseTuple with "s" format when parsing argument with + NUL: Bogus TypeError detail string. + - Issue #5175: PyLong_AsUnsignedLongLong now raises OverflowError for negative arguments. Previously, it raised TypeError. diff --git a/Python/getargs.c b/Python/getargs.c index a5dc360..486cf7d 100644 --- a/Python/getargs.c +++ b/Python/getargs.c @@ -387,7 +387,7 @@ vgetargs1(PyObject *args, const char *format, va_list *p_va, int flags) flags, levels, msgbuf, sizeof(msgbuf), &freelist); if (msg) { - seterror(i+1, msg, levels, fname, message); + seterror(i+1, msg, levels, fname, msg); return cleanreturn(0, freelist); } } |