traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix globals/locals defaults for eval/execfile

This commit is contained in:
Guido van Rossum 1995-01-10 10:47:05 +00:00
parent 10393b1708
commit 84eaa8396e
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Python/bltinmodule.c
View File

@ -384,7 +384,7 @@ builtin_eval(self, args)
object *args;
{
object *cmd;
object *globals = NULL, *locals = NULL;
object *globals = None, *locals = None;
char *str;
if (!newgetargs(args, "O|O!O!:eval",
@ -392,12 +392,12 @@ builtin_eval(self, args)
&Mappingtype, &globals,
&Mappingtype, &locals))
return NULL;
if (globals == NULL) {
if (globals == None) {
globals = getglobals();
if (globals == NULL)
return NULL;
if (locals == None)
locals = getlocals();
}
if (locals == NULL)
else if (locals == None)
locals = globals;
if (dictlookup(globals, "__builtins__") == NULL) {
if (dictinsert(globals, "__builtins__", getbuiltins()) != 0)
@ -428,7 +428,7 @@ builtin_execfile(self, args)
object *args;
{
char *filename;
object *globals = NULL, *locals = NULL;
object *globals = None, *locals = None;
object *res;
FILE* fp;
char *s;
@ -439,12 +439,12 @@ builtin_execfile(self, args)
&Mappingtype, &globals,
&Mappingtype, &locals))
return NULL;
if (globals == NULL) {
if (globals == None) {
globals = getglobals();
if (globals == NULL)
return NULL;
if (locals == None)
locals = getlocals();
}
if (locals == NULL)
else if (locals == None)
locals = globals;
if (dictlookup(globals, "__builtins__") == NULL) {
if (dictinsert(globals, "__builtins__", getbuiltins()) != 0)