diff Python/pythonrun.c @ 6328:dfeaf965f48a legacy-trunk

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.
author Barry Warsaw <barry@python.org>
date Thu, 18 Sep 1997 16:42:02 +0000
parents 05d943c4597c
children f6ef9af4c8b9
line wrap: on
line diff
--- a/Python/pythonrun.c	Thu Sep 18 03:44:38 1997 +0000
+++ b/Python/pythonrun.c	Thu Sep 18 16:42:02 1997 +0000
@@ -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();