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. ........
This commit is contained in:
parent
86a31f55fe
commit
878c3b004b
|
@ -35,6 +35,9 @@ Core and Builtins
|
|||
C-API
|
||||
-----
|
||||
|
||||
- Issue #6624: yArg_ParseTuple with "s" format when parsing argument with
|
||||
NUL: Bogus TypeError detail string.
|
||||
|
||||
- Issue #6405: Remove duplicate type declarations in descrobject.h.
|
||||
|
||||
- The code flags for old __future__ features are now available again.
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue