mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-27 04:05:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

different init for __builtins__

Browse source
This commit is contained in:
Guido van Rossum 1995-01-17 16:27:25 +00:00
parent cd938fc5a1
commit b4e7e25fe6
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Objects/frameobject.c
View file

@ -149,6 +149,8 @@ newframeobject(back, code, globals, locals, owner, nvalues, nblocks)
return NULL; return NULL;
} }
builtins = dictlookup(globals, "__builtins__"); builtins = dictlookup(globals, "__builtins__");
if (builtins != NULL && is_moduleobject(builtins))
builtins = getmoduledict(builtins);
if (builtins == NULL || !is_mappingobject(builtins)) { if (builtins == NULL || !is_mappingobject(builtins)) {
err_setstr(TypeError, "bad __builtins__ dictionary"); err_setstr(TypeError, "bad __builtins__ dictionary");
return NULL; return NULL;

4
Python/ceval.c
View file

@ -737,8 +737,8 @@ eval_code(co, globals, locals, owner, arg)
!suppress_print) { !suppress_print) {
flushline(); flushline();
x = sysget("stdout"); x = sysget("stdout");
softspace(x, 1);
err = writeobject(v, x, 0); err = writeobject(v, x, 0);
softspace(x, 1);
flushline(); flushline();
} }
DECREF(v); DECREF(v);
@ -1692,7 +1692,7 @@ object *
getbuiltins() getbuiltins()
{ {
if (current_frame == NULL) if (current_frame == NULL)
return getbuiltindict(); return getbuiltinmod();
else else
return current_frame->f_builtins; return current_frame->f_builtins;
} }