use getbuiltins() everywhere, it defaults to getbuiltidict()
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 @@
#include "import.h"
#include "sysmodule.h"
+#include "bltinmodule.h"
#include "compile.h"
#include "frameobject.h"
#include "eval.h"
@@ -1691,7 +1692,7 @@
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 @@
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 @@
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__");
}
}