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/Python/getargs.c b/Python/getargs.c
index a5dc360..486cf7d 100644
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -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);
 		}
 	}