From: Neal Norwitz <nnorwitz@gmail.com>
Date: Fri, 24 Aug 2007 22:53:58 +0000 (+0000)
Subject: Use unicode for error messages of duplicate args
X-Git-Tag: v3.0a1~285
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a5d16a3f855540a0d67a8bd3ff6927455ed7a8b5;p=thirdparty%2FPython%2Fcpython.git

Use unicode for error messages of duplicate args
---

diff --git a/Python/symtable.c b/Python/symtable.c
index 47fdad22f1e3..59eef02c7478 100644
--- a/Python/symtable.c
+++ b/Python/symtable.c
@@ -189,7 +189,7 @@ static identifier top = NULL, lambda = NULL, genexpr = NULL,
 	((VAR) ? (VAR) : ((VAR) = PyUnicode_InternFromString(# VAR)))
 
 #define DUPLICATE_ARGUMENT \
-"duplicate argument '%s' in function definition"
+"duplicate argument '%U' in function definition"
 
 static struct symtable *
 symtable_new(void)
@@ -868,8 +868,7 @@ symtable_add_def(struct symtable *st, PyObject *name, int flag)
 	    val = PyInt_AS_LONG(o);
 	    if ((flag & DEF_PARAM) && (val & DEF_PARAM)) {
 		    /* Is it better to use 'mangled' or 'name' here? */
-		    PyErr_Format(PyExc_SyntaxError, DUPLICATE_ARGUMENT,
-				 PyString_AsString(name));
+		    PyErr_Format(PyExc_SyntaxError, DUPLICATE_ARGUMENT, name);
 		    PyErr_SyntaxLocation(st->st_filename,
 				       st->st_cur->ste_lineno);
 		    goto error;