diff options
author | Victor Stinner <vstinner@redhat.com> | 2018-07-21 03:54:20 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-21 03:54:20 +0200 |
commit | f2626ce6d4136f13a506e34ca8631ff2eab85fd9 (patch) | |
tree | 4ff9ea663d47622f013a6f42585641585471af43 /Python/pylifecycle.c | |
parent | c884616390f990a58fe337376904530a48a0e833 (diff) | |
download | cpython-git-f2626ce6d4136f13a506e34ca8631ff2eab85fd9.tar.gz |
bpo-34170: _PyCoreConfig_Read() leaves Py_IsolatedFlag unchanged (GH-8361)
* _PyCoreConfig_Read() no longer directly modifies Py_IsolatedFlag
and Py_NoSiteFlag global configuration flags. The function now
requires two pointers to integer, so these flags can be set later,
to avoid side effets in _PyCoreConfig_Read().
* pathconfig_global_init() now leaves Py_IsolatedFlag and
Py_NoSiteFlag unchanged.
* Fix pathconfig_global_init(): avoid computing the path
configuration twice, use _PyCoreConfig_SetPathConfig().
Diffstat (limited to 'Python/pylifecycle.c')
-rw-r--r-- | Python/pylifecycle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index 325f42305f..584aa556bd 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -928,7 +928,7 @@ _Py_InitializeEx_Private(int install_sigs, int install_importlib) config._disable_importlib = !install_importlib; config.install_signal_handlers = install_sigs; - err = _PyCoreConfig_Read(&config); + err = _PyCoreConfig_Read(&config, &Py_IsolatedFlag, &Py_NoSiteFlag); if (_Py_INIT_FAILED(err)) { goto done; } |