diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2012-12-15 19:26:38 +0100 |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2012-12-15 19:26:38 +0100 |
| commit | c48e81ed46604db34783924307bc6bc01d9fa3c6 (patch) | |
| tree | b6852ca7f37bc16065edd3cc5cbef45e48d51150 /Python | |
| parent | 3454339430b892f6d45abdc695c7ad2ddb1bf8f6 (diff) | |
| parent | 9272279afdd5f102f0f1d4022da61265c5a46d04 (diff) | |
| download | cpython-git-c48e81ed46604db34783924307bc6bc01d9fa3c6.tar.gz | |
Merge
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/ceval.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Python/ceval.c b/Python/ceval.c index 807fa7d2c3..32c203ecbc 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -2162,9 +2162,8 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) else { v = PyObject_GetItem(locals, name); if (v == NULL && PyErr_Occurred()) { - if (!PyErr_ExceptionMatches( - PyExc_KeyError)) - break; + if (!PyErr_ExceptionMatches(PyExc_KeyError)) + goto error; PyErr_Clear(); } } |