diff options
author | Barry Warsaw <barry@python.org> | 1997-09-18 16:42:02 (GMT) |
---|---|---|
committer | Barry Warsaw <barry@python.org> | 1997-09-18 16:42:02 (GMT) |
commit | 963b871e86bd85b7fb3551fa9fac5363977fc43b (patch) | |
tree | 63f5736b891fed2bb7966622c8247c5967fc9198 | |
parent | b01a7fa5f8208fb5c767964e63b44f0a02814f62 (diff) | |
download | cpython-963b871e86bd85b7fb3551fa9fac5363977fc43b.zip cpython-963b871e86bd85b7fb3551fa9fac5363977fc43b.tar.gz cpython-963b871e86bd85b7fb3551fa9fac5363977fc43b.tar.bz2 |
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.
-rw-r--r-- | Python/pythonrun.c | 2 |
1 files changed, 1 insertions, 1 deletions
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_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(); |