diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2015-04-03 13:10:54 +0200 |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2015-04-03 13:10:54 +0200 |
| commit | e5a1ccdc5648669a45fd37781f99b022bdd1dd52 (patch) | |
| tree | abc631f6077629220545c2c606b2beaad6ef0f68 /Python/pylifecycle.c | |
| parent | 2b319199ff5ba48ce7ebf0816241623538f6923e (diff) | |
| download | cpython-e5a1ccdc5648669a45fd37781f99b022bdd1dd52.tar.gz | |
Issue #22117: Add a new _PyTime_FromSeconds() function
Fix also _Py_InitializeEx_Private(): initialize time before initializing
import, import_init() uses the _PyTime API (for thread locks).
Diffstat (limited to 'Python/pylifecycle.c')
| -rw-r--r-- | Python/pylifecycle.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index 38543e05ef..bab3a2f38a 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -405,15 +405,15 @@ _Py_InitializeEx_Private(int install_sigs, int install_importlib) if (!install_importlib) return; + if (_PyTime_Init() < 0) + Py_FatalError("Py_Initialize: can't initialize time"); + import_init(interp, sysmod); /* initialize the faulthandler module */ if (_PyFaulthandler_Init()) Py_FatalError("Py_Initialize: can't initialize faulthandler"); - if (_PyTime_Init() < 0) - Py_FatalError("Py_Initialize: can't initialize time"); - if (initfsencoding(interp) < 0) Py_FatalError("Py_Initialize: unable to load the file system codec"); |