diff options
| author | Victor Stinner <vstinner@python.org> | 2020-11-10 20:10:22 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-10 20:10:22 (GMT) |
| commit | ace3f9a0ce7b9fe8ae757fdd614f1e7a171f92b0 (patch) | |
| tree | 2d4d60ce52caedd15d8825c2fc2842340ae21d31 /Python/initconfig.c | |
| parent | 1e996c3a3b51e9c6f1f4cea8a6dbcf3bcb865060 (diff) | |
| download | cpython-ace3f9a0ce7b9fe8ae757fdd614f1e7a171f92b0.zip cpython-ace3f9a0ce7b9fe8ae757fdd614f1e7a171f92b0.tar.gz cpython-ace3f9a0ce7b9fe8ae757fdd614f1e7a171f92b0.tar.bz2 | |
bpo-42260: Fix _PyConfig_Read() if compute_path_config=0 (GH-23220)
Fix _PyConfig_Read() if compute_path_config=0: use values set by
Py_SetPath(), Py_SetPythonHome() and Py_SetProgramName(). Add
compute_path_config parameter to _PyConfig_InitPathConfig().
The following functions now return NULL if called before
Py_Initialize():
* Py_GetExecPrefix()
* Py_GetPath()
* Py_GetPrefix()
* Py_GetProgramFullPath()
* Py_GetProgramName()
* Py_GetPythonHome()
These functions no longer automatically computes the Python Path
Configuration. Moreover, Py_SetPath() no longer computes
program_full_path.
Diffstat (limited to 'Python/initconfig.c')
| -rw-r--r-- | Python/initconfig.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Python/initconfig.c b/Python/initconfig.c index 11db4a3..1fcc360 100644 --- a/Python/initconfig.c +++ b/Python/initconfig.c @@ -2069,8 +2069,8 @@ config_read(PyConfig *config, int compute_path_config) } } - if (compute_path_config && config->_install_importlib) { - status = _PyConfig_InitPathConfig(config); + if (config->_install_importlib) { + status = _PyConfig_InitPathConfig(config, compute_path_config); if (_PyStatus_EXCEPTION(status)) { return status; } |