[Python-checkins] r74374 - in python/branches/release31-maint: Misc/NEWS Python/getargs.c
georg.brandl
python-checkins at python.org
Thu Aug 13 10:36:43 CEST 2009
Author: georg.brandl
Date: Thu Aug 13 10:36:43 2009
New Revision: 74374
Log:
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.
........
Modified:
python/branches/release31-maint/ (props changed)
python/branches/release31-maint/Misc/NEWS
python/branches/release31-maint/Python/getargs.c
Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS (original)
+++ python/branches/release31-maint/Misc/NEWS Thu Aug 13 10:36:43 2009
@@ -35,6 +35,9 @@
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.
Modified: python/branches/release31-maint/Python/getargs.c
==============================================================================
--- python/branches/release31-maint/Python/getargs.c (original)
+++ python/branches/release31-maint/Python/getargs.c Thu Aug 13 10:36:43 2009
@@ -387,7 +387,7 @@
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);
}
}
More information about the Python-checkins
mailing list