Mercurial > cpython-lru_cache-weakref
diff Python/bltinmodule.c @ 2106:2ebb21284f34 legacy-trunk
fix globals/locals defaults for eval/execfile
| author | Guido van Rossum <guido@python.org> |
|---|---|
| date | Tue, 10 Jan 1995 10:47:05 +0000 |
| parents | b7be0382f9ee |
| children | 76c860a18d82 |
line wrap: on
line diff
--- a/Python/bltinmodule.c Tue Jan 10 10:39:49 1995 +0000 +++ b/Python/bltinmodule.c Tue Jan 10 10:47:05 1995 +0000 @@ -384,7 +384,7 @@ 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 @@ &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 @@ object *args; { char *filename; - object *globals = NULL, *locals = NULL; + object *globals = None, *locals = None; object *res; FILE* fp; char *s; @@ -439,12 +439,12 @@ &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)