commit ef072961e1773ad6b066ae22fc507c28f91c6a3a
author Victor Stinner <victor.stinner@gmail.com> Thu Nov 05 13:55:43 2015 +0100
committer Victor Stinner <victor.stinner@gmail.com> Thu Nov 05 13:55:43 2015 +0100
tree d6607e3f413fcc73dab9660669596a56255e3007
parent cf01b68b889f637c6fb3f11029df3a96b840333d
parent 60a1d3cd152e9340727409ee48372a7cbc31a16f

Merge 3.5

Python/ceval.c

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 @@
                 /* 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))