comparison Python/pythonrun.c @ 11113:be8ec828c072 legacy-trunk

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.
author Guido van Rossum <guido@python.org>
date Thu, 08 Jul 1999 17:26:56 +0000
parents a4a268b725b2
children 5e6e9e893acd
comparison
equal deleted inserted replaced
11112:78f5bf179750 11113:be8ec828c072
147 _PyImport_FixupExtension("sys", "sys"); 147 _PyImport_FixupExtension("sys", "sys");
148 PySys_SetPath(Py_GetPath()); 148 PySys_SetPath(Py_GetPath());
149 PyDict_SetItemString(interp->sysdict, "modules", 149 PyDict_SetItemString(interp->sysdict, "modules",
150 interp->modules); 150 interp->modules);
151 151
152 _PyImport_Init();
153
152 /* phase 2 of builtins */ 154 /* phase 2 of builtins */
153 _PyBuiltin_Init_2(interp->builtins); 155 _PyBuiltin_Init_2(interp->builtins);
154 _PyImport_FixupExtension("__builtin__", "__builtin__"); 156 _PyImport_FixupExtension("__builtin__", "__builtin__");
155
156 _PyImport_Init();
157 157
158 initsigs(); /* Signal handling stuff, including initintr() */ 158 initsigs(); /* Signal handling stuff, including initintr() */
159 159
160 initmain(); /* Module __main__ */ 160 initmain(); /* Module __main__ */
161 if (!Py_NoSiteFlag) 161 if (!Py_NoSiteFlag)