* Fix missing return after error message is set.

* Add a test case that would have caught it.

diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py
index 8fea0ca684538a028b985a468900deb2273242eb..fdbbdfcb8506cd61e328691a2f2efa9dbe270b18 100644 (file)
--- a/Lib/test/test_builtin.py
+++ b/Lib/test/test_builtin.py
@@ -281,6 +281,7 @@ class BuiltinTest(unittest.TestCase):
         self.assertEqual(eval('dir()', g, m), list('xyz'))
         self.assertEqual(eval('globals()', g, m), g)
         self.assertEqual(eval('locals()', g, m), m)
+        self.assertRaises(TypeError, eval, 'a', m)
 
         # Verify that dict subclasses work as well
         class D(dict):

diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index f4f8b7a1a7be54b775703324515b2b8dd403bfad..3604601f648f07a570e08497b265f7dceaffec4d 100644 (file)
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -459,12 +459,13 @@ builtin_eval(PyObject *self, PyObject *args)
                return NULL;
        if (locals != Py_None && !PyMapping_Check(locals)) {
                PyErr_SetString(PyExc_TypeError, "locals must be a mapping");
-                       return NULL;
+               return NULL;
        }
        if (globals != Py_None && !PyDict_Check(globals)) {
                PyErr_SetString(PyExc_TypeError, PyMapping_Check(globals) ? 
                        "globals must be a real dict; try eval(expr, {}, mapping)"
                        : "globals must be a dict");
+               return NULL;
        }
        if (globals == Py_None) {
                globals = PyEval_GetGlobals();