Py_Initialize(): move the call to _PyImport_FixupExtension() to after

the phase 2 init of the __builtin__ module, so that multiple
interpreters will get the right exceptions.

diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 63646161eafa4ea8557754de8adf0b56da6c8505..e5dc41fa93a57861d309a3efafc91eb5d3579d45 100644 (file)
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -136,7 +136,6 @@ Py_Initialize()
                Py_FatalError("Py_Initialize: can't initialize __builtin__");
        interp->builtins = PyModule_GetDict(bimod);
        Py_INCREF(interp->builtins);
-       _PyImport_FixupExtension("__builtin__", "__builtin__");
 
        sysmod = _PySys_Init();
        if (sysmod == NULL)
@@ -150,6 +149,7 @@ Py_Initialize()
 
        /* phase 2 of builtins */
        _PyBuiltin_Init_2(interp->builtins);
+       _PyImport_FixupExtension("__builtin__", "__builtin__");
 
        _PyImport_Init();