Mercurial > cpython-lru_cache-weakref
diff Python/ceval.c @ 82459:f1d3fbcd837d
#17032: The "global" in the "NameError: global name 'x' is not defined" error message has been removed. Patch by Ram Rachum.
| author | Ezio Melotti <ezio.melotti@gmail.com> |
|---|---|
| date | Sun, 03 Mar 2013 15:12:44 +0200 |
| parents | d296cf1600a8 |
| children | 6297fcddf912 |
line wrap: on
line diff
--- a/Python/ceval.c Sat Mar 02 14:48:01 2013 +0200 +++ b/Python/ceval.c Sun Mar 03 15:12:44 2013 +0200 @@ -142,8 +142,6 @@ #define NAME_ERROR_MSG \ "name '%.200s' is not defined" -#define GLOBAL_NAME_ERROR_MSG \ - "global name '%.200s' is not defined" #define UNBOUNDLOCAL_ERROR_MSG \ "local variable '%.200s' referenced before assignment" #define UNBOUNDFREE_ERROR_MSG \ @@ -2140,7 +2138,7 @@ err = PyDict_DelItem(f->f_globals, name); if (err != 0) { format_exc_check_arg( - PyExc_NameError, GLOBAL_NAME_ERROR_MSG, name); + PyExc_NameError, NAME_ERROR_MSG, name); goto error; } DISPATCH(); @@ -2208,7 +2206,7 @@ if (v == NULL) { if (!PyErr_Occurred()) format_exc_check_arg(PyExc_NameError, - GLOBAL_NAME_ERROR_MSG, name); + NAME_ERROR_MSG, name); goto error; } Py_INCREF(v); @@ -2222,7 +2220,7 @@ if (PyErr_ExceptionMatches(PyExc_KeyError)) format_exc_check_arg( PyExc_NameError, - GLOBAL_NAME_ERROR_MSG, name); + NAME_ERROR_MSG, name); goto error; } }