diff options
author | Georg Brandl <georg@python.org> | 2009-08-13 08:36:43 (GMT) |
---|---|---|
committer | Georg Brandl <georg@python.org> | 2009-08-13 08:36:43 (GMT) |
commit | 878c3b004b09cb9242f7523366b616ae0715438a (patch) | |
tree | 1d69598313cde39494b1e1d3a4ed44e032cbb000 /Python | |
parent | 86a31f55fe3117b0ed0ad97cdffad816c1ded779 (diff) | |
download | cpython-878c3b004b09cb9242f7523366b616ae0715438a.zip cpython-878c3b004b09cb9242f7523366b616ae0715438a.tar.gz cpython-878c3b004b09cb9242f7523366b616ae0715438a.tar.bz2 |
Merged revisions 74278 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k
........
r74278 | sean.reifschneider | 2009-08-02 01:55:06 +0200 (So, 02 Aug 2009) | 3 lines
- Issue #6624: yArg_ParseTuple with "s" format when parsing argument with
NUL: Bogus TypeError detail string.
........
Diffstat (limited to 'Python')
-rw-r--r-- | Python/getargs.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); } } |