commit 20f9c3c50f5e642295040c05e574ff9dc84bf207
author Benjamin Peterson <benjamin@python.org> Tue Jul 20 22:39:34 2010 +0000
committer Benjamin Peterson <benjamin@python.org> Tue Jul 20 22:39:34 2010 +0000
tree a0bb84cba5bcdcb1fb7b059930076f52d3d3225c
parent 013783c529cfc459d05d261f5053ad7bf7d88c29

revert unintended changes

Python/ceval.c

diff --git a/Python/ceval.c b/Python/ceval.c
index 368ad69..2d4b16a 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -2052,7 +2052,6 @@
             break;
 
         TARGET(LOAD_NAME)
-        TARGET(LOAD_NAME_LOCAL_ONLY)
             w = GETITEM(names, oparg);
             if ((v = f->f_locals) == NULL) {
                 PyErr_Format(PyExc_SystemError,
@@ -2074,14 +2073,15 @@
                 }
             }
             if (x == NULL) {
-                if (opcode != LOAD_NAME_LOCAL_ONLY) {
-                    x = PyDict_GetItem(f->f_globals, w);
-                    if (x == NULL)
-                        x = PyDict_GetItem(f->f_builtins, w);
-                }
+                x = PyDict_GetItem(f->f_globals, w);
                 if (x == NULL) {
-                    format_exc_check_arg(PyExc_NameError, NAME_ERROR_MSG, w);
-                    break;
+                    x = PyDict_GetItem(f->f_builtins, w);
+                    if (x == NULL) {
+                        format_exc_check_arg(
+                                    PyExc_NameError,
+                                    NAME_ERROR_MSG, w);
+                        break;
+                    }
                 }
                 Py_INCREF(x);
             }