summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1995-01-12 11:37:57 (GMT)
committerGuido van Rossum <guido@python.org>1995-01-12 11:37:57 (GMT)
commit94390ec2a6ea5acbea9dead528ce067c396a0301 (patch)
treec21a7fa8324d17b76e00ae991621c0be673c3dba /Python
parent922d8ff8036c2916471163c78010d8deab9eefc2 (diff)
downloadcpython-94390ec2a6ea5acbea9dead528ce067c396a0301.zip
cpython-94390ec2a6ea5acbea9dead528ce067c396a0301.tar.gz
cpython-94390ec2a6ea5acbea9dead528ce067c396a0301.tar.bz2
use getbuiltins() everywhere, it defaults to getbuiltidict()
Diffstat (limited to 'Python')
-rw-r--r--Python/ceval.c3
-rw-r--r--Python/import.c2
-rw-r--r--Python/pythonrun.c2
3 files changed, 4 insertions, 3 deletions
diff --git a/Python/ceval.c b/Python/ceval.c
index 79874ef..2d16ef8 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -28,6 +28,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "import.h"
#include "sysmodule.h"
+#include "bltinmodule.h"
#include "compile.h"
#include "frameobject.h"
#include "eval.h"
@@ -1691,7 +1692,7 @@ object *
getbuiltins()
{
if (current_frame == NULL)
- return NULL;
+ return getbuiltindict();
else
return current_frame->f_builtins;
}
diff --git a/Python/import.c b/Python/import.c
index 1d9ea35..302cc25 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -149,7 +149,7 @@ exec_code_module(name, co)
return NULL;
d = getmoduledict(m);
if (dictlookup(d, "__builtins__") == NULL) {
- if (dictinsert(d, "__builtins__", getbuiltindict()) != 0)
+ if (dictinsert(d, "__builtins__", getbuiltins()) != 0)
return NULL;
}
v = eval_code((codeobject *)co, d, d, d, (object *)NULL);
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index a25cbba..11bd029 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -100,7 +100,7 @@ initmain()
fatal("can't create __main__ module");
d = getmoduledict(m);
if (dictlookup(d, "__builtins__") == NULL) {
- if (dictinsert(d, "__builtins__", getbuiltindict()))
+ if (dictinsert(d, "__builtins__", getbuiltins()))
fatal("can't add __builtins__ to __main__");
}
}