mirror of https://github.com/python/cpython
use getbuiltins() everywhere, it defaults to getbuiltidict()
This commit is contained in:
parent
922d8ff803
commit
94390ec2a6
|
@ -28,6 +28,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|||
|
||||
#include "import.h"
|
||||
#include "sysmodule.h"
|
||||
#include "bltinmodule.h"
|
||||
#include "compile.h"
|
||||
#include "frameobject.h"
|
||||
#include "eval.h"
|
||||
|
@ -1691,7 +1692,7 @@ object *
|
|||
getbuiltins()
|
||||
{
|
||||
if (current_frame == NULL)
|
||||
return NULL;
|
||||
return getbuiltindict();
|
||||
else
|
||||
return current_frame->f_builtins;
|
||||
}
|
||||
|
|
|
@ -149,7 +149,7 @@ exec_code_module(name, co)
|
|||
return NULL;
|
||||
d = getmoduledict(m);
|
||||
if (dictlookup(d, "__builtins__") == NULL) {
|
||||
if (dictinsert(d, "__builtins__", getbuiltindict()) != 0)
|
||||
if (dictinsert(d, "__builtins__", getbuiltins()) != 0)
|
||||
return NULL;
|
||||
}
|
||||
v = eval_code((codeobject *)co, d, d, d, (object *)NULL);
|
||||
|
|
|
@ -100,7 +100,7 @@ initmain()
|
|||
fatal("can't create __main__ module");
|
||||
d = getmoduledict(m);
|
||||
if (dictlookup(d, "__builtins__") == NULL) {
|
||||
if (dictinsert(d, "__builtins__", getbuiltindict()))
|
||||
if (dictinsert(d, "__builtins__", getbuiltins()))
|
||||
fatal("can't add __builtins__ to __main__");
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue