Skip to content

C
cpython
Kaydet (Commit) 84eaa839 authored tarafından Guido van Rossum's avatar Guido van Rossum
Dosyalara gözat
Seçenekler

fix globals/locals defaults for eval/execfile

üst 10393b17
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
Python/bltinmodule.c
Dosyayı görüntüle @ 84eaa839
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment