From dd7eb146a8c5509a473b22f15eb91ada790fd0ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Sat, 18 Oct 2003 22:05:25 +0000 Subject: Patch #792869: Clarify error message for parameters declared global, rename LOCAL_GLOBAL to PARAM_GLOBAL. --- Python/compile.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Python/compile.c b/Python/compile.c index 02c7873..4fb47ae 100644 --- a/Python/compile.c +++ b/Python/compile.c @@ -60,7 +60,7 @@ int Py_OptimizeFlag = 0; #define GLOBAL_AFTER_USE \ "name '%.400s' is used prior to global declaration" -#define LOCAL_GLOBAL \ +#define PARAM_GLOBAL \ "name '%.400s' is a function parameter and declared global" #define LATE_FUTURE \ @@ -4843,7 +4843,7 @@ symtable_load_symbols(struct compiling *c) c->c_argcount--; else if (flags & DEF_GLOBAL) { if (flags & DEF_PARAM) { - PyErr_Format(PyExc_SyntaxError, LOCAL_GLOBAL, + PyErr_Format(PyExc_SyntaxError, PARAM_GLOBAL, PyString_AS_STRING(name)); symtable_error(st, 0); goto fail; @@ -5592,8 +5592,7 @@ symtable_global(struct symtable *st, node *n) if (flags && flags != DEF_GLOBAL) { char buf[500]; if (flags & DEF_PARAM) { - PyErr_Format(PyExc_SyntaxError, - "name '%.400s' is local and global", + PyErr_Format(PyExc_SyntaxError, PARAM_GLOBAL, name); symtable_error(st, 0); return; -- cgit v0.12