diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2015-11-05 12:55:43 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2015-11-05 12:55:43 (GMT) |
| commit | ef072961e1773ad6b066ae22fc507c28f91c6a3a (patch) | |
| tree | d6607e3f413fcc73dab9660669596a56255e3007 /Python | |
| parent | cf01b68b889f637c6fb3f11029df3a96b840333d (diff) | |
| parent | 60a1d3cd152e9340727409ee48372a7cbc31a16f (diff) | |
| download | cpython-ef072961e1773ad6b066ae22fc507c28f91c6a3a.zip cpython-ef072961e1773ad6b066ae22fc507c28f91c6a3a.tar.gz cpython-ef072961e1773ad6b066ae22fc507c28f91c6a3a.tar.bz2 | |
Merge 3.5
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/ceval.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Python/ceval.c b/Python/ceval.c index 60db703..67ea388 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -2363,6 +2363,10 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) /* Slow-path if globals or builtins is not a dict */ v = PyObject_GetItem(f->f_globals, name); if (v == NULL) { + if (!PyErr_ExceptionMatches(PyExc_KeyError)) + goto error; + PyErr_Clear(); + v = PyObject_GetItem(f->f_builtins, name); if (v == NULL) { if (PyErr_ExceptionMatches(PyExc_KeyError)) |