diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2015-11-05 13:55:43 +0100 |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2015-11-05 13:55:43 +0100 |
| commit | aaa7915cb92cbdf3b39e20c876c8af77478f1fc3 (patch) | |
| tree | cb6ec9d5b05794e8f6d43ee2cbb0ab6522b7dbc6 /Python | |
| parent | cb099abb93a287d397088d6bd10735e6bc26afa7 (diff) | |
| parent | 8bd2d0b8bd744a976d163daee2bd7fdb5f8dd184 (diff) | |
| download | cpython-aaa7915cb92cbdf3b39e20c876c8af77478f1fc3.tar.gz | |
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 60db703212..67ea388d85 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)) |