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 6364616..e5dc41f 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -136,7 +136,6 @@
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 @@
/* phase 2 of builtins */
_PyBuiltin_Init_2(interp->builtins);
+ _PyImport_FixupExtension("__builtin__", "__builtin__");
_PyImport_Init();