different init for __builtins__

diff --git a/Objects/frameobject.c b/Objects/frameobject.c
index 52b4e52455dbe5ba6e3db18b10f2f05ca8869634..beb4c2db6454ab92e7bf8548acb2f2d41ad69472 100644 (file)
--- a/Objects/frameobject.c
+++ b/Objects/frameobject.c
@@ -149,6 +149,8 @@ newframeobject(back, code, globals, locals, owner, nvalues, nblocks)
                return NULL;
        }
        builtins = dictlookup(globals, "__builtins__");
+       if (builtins != NULL && is_moduleobject(builtins))
+               builtins = getmoduledict(builtins);
        if (builtins == NULL || !is_mappingobject(builtins)) {
                err_setstr(TypeError, "bad __builtins__ dictionary");
                return NULL;

diff --git a/Python/ceval.c b/Python/ceval.c
index 2d16ef8a9e9bb7cc121b9dfcbd1d1a3e2f470f2e..08758ebe197539807e1bd9349792038cc48d92aa 100644 (file)
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -737,8 +737,8 @@ eval_code(co, globals, locals, owner, arg)
                            !suppress_print) {
                                flushline();
                                x = sysget("stdout");
-                               softspace(x, 1);
                                err = writeobject(v, x, 0);
+                               softspace(x, 1);
                                flushline();
                        }
                        DECREF(v);
@@ -1692,7 +1692,7 @@ object *
 getbuiltins()
 {
        if (current_frame == NULL)
-               return getbuiltindict();
+               return getbuiltinmod();
        else
                return current_frame->f_builtins;
 }