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.
........

diff --git a/Misc/NEWS b/Misc/NEWS
index 8c9bb93bbf50a1718aa94c7fe14ba4aa6c295ad1..150ea589ed3c69406294d19ddbb5d3328e5eb4e4 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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.

diff --git a/Python/getargs.c b/Python/getargs.c
index a5dc3602b2b7ce487363f4c5aa407ce834b9610e..486cf7d07d3172693e09f6cf43d8bb1d20c86de5 100644 (file)
--- 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);
                }
        }