[pypy-commit] pypy py3.5: Issue #17032: The "global" in the "NameError: global name 'x' is not defined"

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: py3.5
Changeset: r89417:cbb0db3f773d
Date: 2017-01-08 16:19 +0100
http://bitbucket.org/pypy/pypy/changeset/cbb0db3f773d/

Log:	Issue #17032: The "global" in the "NameError: global name 'x' is not
	defined" error message has been removed.

diff --git a/pypy/interpreter/pyopcode.py b/pypy/interpreter/pyopcode.py
--- a/pypy/interpreter/pyopcode.py
+++ b/pypy/interpreter/pyopcode.py
@@ -923,8 +923,10 @@
 
     @dont_inline
     def _load_global_failed(self, w_varname):
+        # CPython Issue #17032: The "global" in the "NameError: global
+        # name 'x' is not defined" error message has been removed.
         raise oefmt(self.space.w_NameError,
-                    "global name %R is not defined", w_varname)
+                    "name %R is not defined", w_varname)
 
     @always_inline
     def LOAD_GLOBAL(self, nameindex, next_instr):