different init for __builtins__

gvanrossum · gvanrossum · commit b4e7e25fe6f7 · 1995-01-17T16:27:25.000Z
diff --git 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
@@ -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;
 }

Original file line number	Diff line number	Diff line change
`@@ -149,6 +149,8 @@ newframeobject(back, code, globals, locals, owner, nvalues, nblocks)`
`149`	`149`	`return NULL;`
`150`	`150`	`}`
`151`	`151`	`builtins = dictlookup(globals, "__builtins__");`
	`152`	`+ if (builtins != NULL && is_moduleobject(builtins))`
	`153`	`+ builtins = getmoduledict(builtins);`
`152`	`154`	`if (builtins == NULL \|\| !is_mappingobject(builtins)) {`
`153`	`155`	`err_setstr(TypeError, "bad __builtins__ dictionary");`
`154`	`156`	`return NULL;`
Original file line number	Diff line number	Diff line change
`@@ -737,8 +737,8 @@ eval_code(co, globals, locals, owner, arg)`
`737`	`737`	`!suppress_print) {`
`738`	`738`	`flushline();`
`739`	`739`	`x = sysget("stdout");`
`740`		`- softspace(x, 1);`
`741`	`740`	`err = writeobject(v, x, 0);`
	`741`	`+ softspace(x, 1);`
`742`	`742`	`flushline();`
`743`	`743`	`}`
`744`	`744`	`DECREF(v);`
`@@ -1692,7 +1692,7 @@ object *`
`1692`	`1692`	`getbuiltins()`
`1693`	`1693`	`{`
`1694`	`1694`	`if (current_frame == NULL)`
`1695`		`- return getbuiltindict();`
	`1695`	`+ return getbuiltinmod();`
`1696`	`1696`	`else`
`1697`	`1697`	`return current_frame->f_builtins;`
`1698`	`1698`	`}`