commit d5698cbbcade36d49bb32e797499d1190c38558a
author Victor Stinner <victor.stinner@gmail.com> Tue Jul 31 02:55:49 2012 +0200
committer Victor Stinner <victor.stinner@gmail.com> Tue Jul 31 02:55:49 2012 +0200
tree 4c743f1ff57018f73dc118ebb08b97edbd83b260
parent 60622ed12aed572573a95b88428f654e88b8e470

Fix initialization of the faulthandler module

faulthandler requires the importlib if "-X faulthandler" option is present on
the command line, so initialize faulthandler after importlib.

Add also an unit test.

Python/pythonrun.c

diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 6ee9a5f..cafc09a 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -356,10 +356,6 @@
 
     _PyImportHooks_Init();
 
-    /* initialize the faulthandler module */
-    if (_PyFaulthandler_Init())
-        Py_FatalError("Py_Initialize: can't initialize faulthandler");
-
     /* Initialize _warnings. */
     _PyWarnings_Init();
 
@@ -368,6 +364,10 @@
 
     import_init(interp, sysmod);
 
+    /* initialize the faulthandler module */
+    if (_PyFaulthandler_Init())
+        Py_FatalError("Py_Initialize: can't initialize faulthandler");
+
     _PyTime_Init();
 
     if (initfsencoding(interp) < 0)