diff options
| author | Barry Warsaw <barry@python.org> | 2012-07-31 16:03:25 -0400 |
|---|---|---|
| committer | Barry Warsaw <barry@python.org> | 2012-07-31 16:03:25 -0400 |
| commit | 9a5af1288deb62d975c044a45711cc179b5a2ad1 (patch) | |
| tree | 767b3a8dc1a144e66cc1e476ddd50a0a8e5cfb92 /Python/pythonrun.c | |
| parent | dadebab42c87e29342de67501a6b280e547fb633 (diff) | |
| parent | 233f6845b3f3498d800b429c4e8d84abcb5726b7 (diff) | |
| download | cpython-git-9a5af1288deb62d975c044a45711cc179b5a2ad1.tar.gz | |
merge
Diffstat (limited to 'Python/pythonrun.c')
| -rw-r--r-- | Python/pythonrun.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Python/pythonrun.c b/Python/pythonrun.c index 6ee9a5fddf..cafc09ac3f 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -356,10 +356,6 @@ _Py_InitializeEx_Private(int install_sigs, int install_importlib) _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 @@ _Py_InitializeEx_Private(int install_sigs, int install_importlib) 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) |