summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1999-07-08 17:26:56 (GMT)
committerGuido van Rossum <guido@python.org>1999-07-08 17:26:56 (GMT)
commit7c85ab829db9628a2f093767966cd92d6f71607b (patch)
tree48567fa7370c3595726a508a84e94a38575b6041 /Python
parent3a4ceb707d7b9acf41a44cb9a42610a1ef9584c9 (diff)
downloadcpython-7c85ab829db9628a2f093767966cd92d6f71607b.zip
cpython-7c85ab829db9628a2f093767966cd92d6f71607b.tar.gz
cpython-7c85ab829db9628a2f093767966cd92d6f71607b.tar.bz2
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.
Diffstat (limited to 'Python')
-rw-r--r--Python/pythonrun.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 0b5d0d1..4e16320 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__ */