commit b44562b6b90c4974ac11aae2caec227295679363
author Victor Stinner <victor.stinner@gmail.com> Wed Nov 06 19:03:11 2013 +0100
committer Victor Stinner <victor.stinner@gmail.com> Wed Nov 06 19:03:11 2013 +0100
tree c2dc54bdbc47d3502ba9583aeb4ed1def151335f
parent 3688aa9a0417b5fbe94510da4a078c3ac3c481e0

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

Python/bltinmodule.c

diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index b0be671..6069e41 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -34,6 +34,7 @@
 
 _Py_IDENTIFIER(fileno);
 _Py_IDENTIFIER(flush);
+_Py_IDENTIFIER(__builtins__);
 
 static PyObject *
 builtin___build_class__(PyObject *self, PyObject *args, PyObject *kwds)
@@ -771,9 +772,9 @@
         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 @@
             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;
     }