Rooba
/
cpython
mirror of https://github.com/python/cpython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #19512: eval() and exec() now use an identifier for "__builtins__" string

This commit is contained in:
Victor Stinner 2013-11-06 19:03:11 +01:00
parent 3688aa9a04
commit b44562b6b9
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Python/bltinmodule.c
View File

@ -34,6 +34,7 @@ int Py_HasFileSystemDefaultEncoding = 0;
_Py_IDENTIFIER(fileno);
_Py_IDENTIFIER(flush);
_Py_IDENTIFIER(__builtins__);
static PyObject *
builtin___build_class__(PyObject *self, PyObject *args, PyObject *kwds)
@ -771,9 +772,9 @@ builtin_eval(PyObject *self, PyObject *args)
return NULL;
}
if (PyDict_GetItemString(globals, "__builtins__") == NULL) {
if (PyDict_SetItemString(globals, "__builtins__",
PyEval_GetBuiltins()) != 0)
if (_PyDict_GetItemId(globals, &PyId___builtins__) == NULL) {
if (_PyDict_SetItemId(globals, &PyId___builtins__,
PyEval_GetBuiltins()) != 0)
return NULL;
}
@ -846,9 +847,9 @@ builtin_exec(PyObject *self, PyObject *args)
locals->ob_type->tp_name);
return NULL;
}
if (PyDict_GetItemString(globals, "__builtins__") == NULL) {
if (PyDict_SetItemString(globals, "__builtins__",
PyEval_GetBuiltins()) != 0)
if (_PyDict_GetItemId(globals, &PyId___builtins__) == NULL) {
if (_PyDict_SetItemId(globals, &PyId___builtins__,
PyEval_GetBuiltins()) != 0)
return NULL;
}