From a5d16a3f855540a0d67a8bd3ff6927455ed7a8b5 Mon Sep 17 00:00:00 2001 From: Neal Norwitz Date: Fri, 24 Aug 2007 22:53:58 +0000 Subject: [PATCH] Use unicode for error messages of duplicate args --- Python/symtable.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Python/symtable.c b/Python/symtable.c index 47fdad22f1e..59eef02c747 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;