diff options
author | Benjamin Peterson <benjamin@python.org> | 2010-07-20 22:39:34 +0000 |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2010-07-20 22:39:34 +0000 |
commit | b1dabe110111af235ea2829b44e9e9f44aed91ef (patch) | |
tree | d94f88d082b8bae81a31268d07bf6f39cee2e2f7 /Python/ceval.c | |
parent | a1047ef59eacea8f3b31386bb6c4a766d6237fd7 (diff) | |
download | cpython-b1dabe110111af235ea2829b44e9e9f44aed91ef.tar.gz |
revert unintended changes
Diffstat (limited to 'Python/ceval.c')
-rw-r--r-- | Python/ceval.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Python/ceval.c b/Python/ceval.c index 368ad695ea..2d4b16a39a 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -2052,7 +2052,6 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) 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 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) } } 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); } |