From: Guido van Rossum <guido@python.org>
Date: Tue, 17 Jan 1995 16:27:25 +0000 (+0000)
Subject: different init for __builtins__
X-Git-Tag: v1.2b2~19
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b4e7e25fe6f7e2c075f463b58ebdcfe21dedaf06;p=thirdparty%2FPython%2Fcpython.git

different init for __builtins__
---

diff --git a/Objects/frameobject.c b/Objects/frameobject.c
index 52b4e52455db..beb4c2db6454 100644
--- 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 2d16ef8a9e9b..08758ebe1975 100644
--- 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;
 }