mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-03 03:22:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Simplify error formatting. Fix error message in

Browse source 
check_unoptimized().
This commit is contained in:
Walter Dörwald 2007-06-11 16:06:26 +00:00
parent 5d4ede1811
commit 4ddbdad8e7
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Python/symtable.c
View file

@ -385,14 +385,14 @@ analyze_name(PySTEntryObject *ste, PyObject *scopes, PyObject *name, long flags,
if (flags & DEF_GLOBAL) { if (flags & DEF_GLOBAL) {
if (flags & DEF_PARAM) { if (flags & DEF_PARAM) {
PyErr_Format(PyExc_SyntaxError, PyErr_Format(PyExc_SyntaxError,
"name '%s' is parameter and global", "name '%U' is parameter and global",
PyUnicode_AsString(name)); name);
return 0; return 0;
} }
if (flags & DEF_NONLOCAL) { if (flags & DEF_NONLOCAL) {
PyErr_Format(PyExc_SyntaxError, PyErr_Format(PyExc_SyntaxError,
"name '%s' is nonlocal and global", "name '%U' is nonlocal and global",
PyUnicode_AsString(name)); name);
return 0; return 0;
} }
SET_SCOPE(scopes, name, GLOBAL_EXPLICIT); SET_SCOPE(scopes, name, GLOBAL_EXPLICIT);
@ -405,8 +405,8 @@ analyze_name(PySTEntryObject *ste, PyObject *scopes, PyObject *name, long flags,
if (flags & DEF_NONLOCAL) { if (flags & DEF_NONLOCAL) {
if (flags & DEF_PARAM) { if (flags & DEF_PARAM) {
PyErr_Format(PyExc_SyntaxError, PyErr_Format(PyExc_SyntaxError,
"name '%s' is parameter and nonlocal", "name '%U' is parameter and nonlocal",
PyUnicode_AsString(name)); name);
return 0; return 0;
} }
if (!bound) { if (!bound) {
@ -416,8 +416,8 @@ analyze_name(PySTEntryObject *ste, PyObject *scopes, PyObject *name, long flags,
} }
if (!PySet_Contains(bound, name)) { if (!PySet_Contains(bound, name)) {
PyErr_Format(PyExc_SyntaxError, PyErr_Format(PyExc_SyntaxError,
"no binding for nonlocal '%s' found", "no binding for nonlocal '%U' found",
PyUnicode_AsString(name)); name);
return 0; return 0;
} }
@ -518,9 +518,9 @@ check_unoptimized(const PySTEntryObject* ste) {
return 1; return 1;
case OPT_IMPORT_STAR: case OPT_IMPORT_STAR:
PyOS_snprintf(buf, sizeof(buf), PyOS_snprintf(buf, sizeof(buf),
"import * is not allowed in function '%.100s' " "import * is not allowed in function '%U' "
"because it is %s", "because it %s",
PyUnicode_AsString(ste->ste_name), trailer); ste->ste_name, trailer);
break; break;
} }