traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use error label instead of breaking eval loop (closes #16693)

This commit is contained in:
Benjamin Peterson 2012-12-15 12:51:05 -05:00
parent 1a714750cf
commit 9272279afd
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Lib/test/test_builtin.py
View File

@ -462,6 +462,11 @@ class BuiltinTest(unittest.TestCase):
self.assertRaises(TypeError, eval, ()) self.assertRaises(TypeError, eval, ())
self.assertRaises(SyntaxError, eval, bom[:2] + b'a') 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): def test_general_eval(self):
# Tests that general mappings can be used for the locals argument # Tests that general mappings can be used for the locals argument

5
Python/ceval.c
View File

@ -2162,9 +2162,8 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
else { else {
v = PyObject_GetItem(locals, name); v = PyObject_GetItem(locals, name);
if (v == NULL && PyErr_Occurred()) { if (v == NULL && PyErr_Occurred()) {
if (!PyErr_ExceptionMatches( if (!PyErr_ExceptionMatches(PyExc_KeyError))
PyExc_KeyError)) goto error;
break;
PyErr_Clear(); PyErr_Clear();
} }
} }