Mercurial > cpython-lru_cache-weakref

diff Python/ceval.c @ 63114:9057ea014461

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revert unintended changes
author Benjamin Peterson <benjamin@python.org>
date Tue, 20 Jul 2010 22:39:34 +0000
parents cbd6f5d24af9
children e54baebbd6ff
line wrap: on
line diff
--- a/Python/ceval.c	Tue Jul 20 22:37:19 2010 +0000
+++ b/Python/ceval.c	Tue Jul 20 22:39:34 2010 +0000
@@ -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);
             }