diff options
author | Antoine Pitrou <solipsis@pitrou.net> | 2012-06-19 22:29:35 +0200 |
---|---|---|
committer | Antoine Pitrou <solipsis@pitrou.net> | 2012-06-19 22:29:35 +0200 |
commit | acf001dca7afd219dde2b5abd928f4258c1b71e7 (patch) | |
tree | 16f04be0fca883f42767e5b1a6f1f7c0a387b216 /Python/pythonrun.c | |
parent | 0b0cbabb153931f82707a9d04a9e50e797240b6e (diff) | |
download | cpython-acf001dca7afd219dde2b5abd928f4258c1b71e7.tar.gz |
Issue #14928: Fix importlib bootstrap issues by using a custom executable (Modules/_freeze_importlib) to build Python/importlib.h.
Diffstat (limited to 'Python/pythonrun.c')
-rw-r--r-- | Python/pythonrun.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/Python/pythonrun.c b/Python/pythonrun.c index d9eb5e7d9f..d9d2fdda81 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -242,7 +242,7 @@ import_init(PyInterpreterState *interp, PyObject *sysmod) void -Py_InitializeEx(int install_sigs) +_Py_InitializeEx_Private(int install_sigs, int install_importlib) { PyInterpreterState *interp; PyThreadState *tstate; @@ -363,6 +363,9 @@ Py_InitializeEx(int install_sigs) /* Initialize _warnings. */ _PyWarnings_Init(); + if (!install_importlib) + return; + import_init(interp, sysmod); _PyTime_Init(); @@ -393,6 +396,12 @@ Py_InitializeEx(int install_sigs) } void +Py_InitializeEx(int install_sigs) +{ + _Py_InitializeEx_Private(install_sigs, 1); +} + +void Py_Initialize(void) { Py_InitializeEx(1); |