diff options
| author | Benjamin Peterson <benjamin@python.org> | 2010-07-20 22:39:34 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2010-07-20 22:39:34 (GMT) |
| commit | 20f9c3c50f5e642295040c05e574ff9dc84bf207 (patch) | |
| tree | a0bb84cba5bcdcb1fb7b059930076f52d3d3225c /Python/ceval.c | |
| parent | 013783c529cfc459d05d261f5053ad7bf7d88c29 (diff) | |
| download | cpython-20f9c3c50f5e642295040c05e574ff9dc84bf207.zip cpython-20f9c3c50f5e642295040c05e574ff9dc84bf207.tar.gz cpython-20f9c3c50f5e642295040c05e574ff9dc84bf207.tar.bz2 | |
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 368ad69..2d4b16a 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); } |