traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge 3.5

This commit is contained in:
Victor Stinner 2015-11-05 13:55:43 +01:00
parent cf01b68b88 60a1d3cd15
commit ef072961e1
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Python/ceval.c
View File

@ -2363,6 +2363,10 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
/* Slow-path if globals or builtins is not a dict */ /* Slow-path if globals or builtins is not a dict */
v = PyObject_GetItem(f->f_globals, name); v = PyObject_GetItem(f->f_globals, name);
if (v == NULL) { if (v == NULL) {
if (!PyErr_ExceptionMatches(PyExc_KeyError))
goto error;
PyErr_Clear();
v = PyObject_GetItem(f->f_builtins, name); v = PyObject_GetItem(f->f_builtins, name);
if (v == NULL) { if (v == NULL) {
if (PyErr_ExceptionMatches(PyExc_KeyError)) if (PyErr_ExceptionMatches(PyExc_KeyError))