From: Victor Stinner <victor.stinner@gmail.com>
Date: Wed, 6 Nov 2013 18:03:11 +0000 (+0100)
Subject: Issue #19512: eval() and exec() now use an identifier for "__builtins__" string
X-Git-Tag: v3.4.0b1~368
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b44562b6b90c4974ac11aae2caec227295679363;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index b0be6715e7c0..6069e41b4853 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -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;
     }