Merge

pitrou · pitrou · commit c48e81ed4660 · 2012-12-15T19:26:38.000+01:00
diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py
@@ -462,6 +462,11 @@ def test_eval(self):
         self.assertRaises(TypeError, eval, ())
         self.assertRaises(SyntaxError, eval, bom[:2] + b'a')
 
+        class X:
+            def __getitem__(self, key):
+                raise ValueError
+        self.assertRaises(ValueError, eval, "foo", {}, X())
+
     def test_general_eval(self):
         # Tests that general mappings can be used for the locals argument
 
diff --git 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();
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -2162,9 +2162,8 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)`
`2162`	`2162`	`else {`
`2163`	`2163`	`v = PyObject_GetItem(locals, name);`
`2164`	`2164`	`if (v == NULL && PyErr_Occurred()) {`
`2165`		`- if (!PyErr_ExceptionMatches(`
`2166`		`- PyExc_KeyError))`
`2167`		`- break;`
	`2165`	`+ if (!PyErr_ExceptionMatches(PyExc_KeyError))`
	`2166`	`+ goto error;`
`2168`	`2167`	`PyErr_Clear();`
`2169`	`2168`	`}`
`2170`	`2169`	`}`