[Python-checkins] python/dist/src/Python compile.c,2.296,2.297

[loewis at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Python
In directory sc8-pr-cvs1:/tmp/cvs-serv22492/Python

Modified Files:
	compile.c 
Log Message:
Patch #792869: Clarify error message for parameters declared global,
rename LOCAL_GLOBAL to PARAM_GLOBAL.


Index: compile.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/compile.c,v
retrieving revision 2.296
retrieving revision 2.297
diff -C2 -d -r2.296 -r2.297
*** compile.c	12 Oct 2003 19:09:37 -0000	2.296
--- compile.c	18 Oct 2003 22:05:25 -0000	2.297
***************
*** 61,65 ****
  "name '%.400s' is used prior to global declaration"
  
! #define LOCAL_GLOBAL \
  "name '%.400s' is a function parameter and declared global"
  
--- 61,65 ----
  "name '%.400s' is used prior to global declaration"
  
! #define PARAM_GLOBAL \
  "name '%.400s' is a function parameter and declared global"
  
***************
*** 4844,4848 ****
  		else if (flags & DEF_GLOBAL) {
  			if (flags & DEF_PARAM) {
! 				PyErr_Format(PyExc_SyntaxError, LOCAL_GLOBAL,
  					     PyString_AS_STRING(name));
  				symtable_error(st, 0);
--- 4844,4848 ----
  		else if (flags & DEF_GLOBAL) {
  			if (flags & DEF_PARAM) {
! 				PyErr_Format(PyExc_SyntaxError, PARAM_GLOBAL,
  					     PyString_AS_STRING(name));
  				symtable_error(st, 0);
***************
*** 5593,5598 ****
  			char buf[500];
  			if (flags & DEF_PARAM) {
! 				PyErr_Format(PyExc_SyntaxError,
! 				     "name '%.400s' is local and global",
  					     name);
  				symtable_error(st, 0);
--- 5593,5597 ----
  			char buf[500];
  			if (flags & DEF_PARAM) {
! 				PyErr_Format(PyExc_SyntaxError, PARAM_GLOBAL,
  					     name);
  				symtable_error(st, 0);