mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

move test_trace.py so as not to conflict with future tests for the trace module

Browse source
This commit is contained in:
Benjamin Peterson 2010-07-20 22:37:19 +00:00
parent 533a167a71
commit 013783c529
8 changed files with 31 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Python/ceval.c
View file

@ -2052,6 +2052,7 @@ 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,
@ -2073,15 +2074,14 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
}
}
if (x == NULL) {
x = PyDict_GetItem(f->f_globals, w);
if (opcode != LOAD_NAME_LOCAL_ONLY) {
x = PyDict_GetItem(f->f_globals, w);
if (x == NULL)
x = PyDict_GetItem(f->f_builtins, w);
}
if (x == NULL) {
x = PyDict_GetItem(f->f_builtins, w);
if (x == NULL) {
format_exc_check_arg(
PyExc_NameError,
NAME_ERROR_MSG, w);
break;
}
format_exc_check_arg(PyExc_NameError, NAME_ERROR_MSG, w);
break;
}
Py_INCREF(x);
}