From: Guido van Rossum <guido@python.org>
Date: Thu, 8 Jul 1999 17:26:56 +0000 (+0000)
Subject: Marc-Andre Lemburg discovered that the switch from .pyc to .pyo files,
X-Git-Tag: v1.6a1~1093
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7c85ab829db9628a2f093767966cd92d6f71607b;p=thirdparty%2FPython%2Fcpython.git

Marc-Andre Lemburg discovered that the switch from .pyc to .pyo files,
done by _PyImport_Init(), comes to late to affect the import of
exceptions.py by _PyBuiltin_Init_2().  Move  _PyImport_Init() up few lines.
---

diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 0b5d0d17e82e..4e1632078ef9 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -149,12 +149,12 @@ Py_Initialize()
 	PyDict_SetItemString(interp->sysdict, "modules",
 			     interp->modules);
 
+	_PyImport_Init();
+
 	/* phase 2 of builtins */
 	_PyBuiltin_Init_2(interp->builtins);
 	_PyImport_FixupExtension("__builtin__", "__builtin__");
 
-	_PyImport_Init();
-
 	initsigs(); /* Signal handling stuff, including initintr() */
 
 	initmain(); /* Module __main__ */