[Python-checkins] cpython (merge 3.5 -> default): Merge 3.5
victor.stinner
python-checkins at python.org
Thu Nov 5 08:02:23 EST 2015
https://hg.python.org/cpython/rev/3261fb7fa17b
changeset: 98968:3261fb7fa17b
parent: 98966:8ade9d907f31
parent: 98967:1e87bcf20707
user: Victor Stinner <victor.stinner at gmail.com>
date: Thu Nov 05 13:55:43 2015 +0100
summary:
Merge 3.5
files:
Python/ceval.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/Python/ceval.c b/Python/ceval.c
--- 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))
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list