mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 11:44:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

* Fix missing return after error message is set.

Browse source 
* Add a test case that would have caught it.
This commit is contained in:
Raymond Hettinger 2004-07-06 13:44:41 +00:00
parent 2f55eb4cca
commit 513ffe8112
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Python/bltinmodule.c
View file

@ -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();