diff options
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/pathconfig.c | 29 | ||||
| -rw-r--r-- | Python/pylifecycle.c | 4 |
2 files changed, 24 insertions, 9 deletions
diff --git a/Python/pathconfig.c b/Python/pathconfig.c index f4e1498668..8126145328 100644 --- a/Python/pathconfig.c +++ b/Python/pathconfig.c @@ -133,7 +133,7 @@ _PyWideStringList_Join(const PyWideStringList *list, wchar_t sep) for (Py_ssize_t i=0; i < list->length; i++) { wchar_t *path = list->items[i]; if (i != 0) { - *str++ = SEP; + *str++ = sep; } len = wcslen(path); memcpy(str, path, len * sizeof(wchar_t)); @@ -145,11 +145,11 @@ _PyWideStringList_Join(const PyWideStringList *list, wchar_t sep) } +#ifdef MS_WINDOWS /* Initialize _Py_dll_path on Windows. Do nothing on other platforms. */ -PyStatus -_PyPathConfig_Init(void) +static PyStatus +_PyPathConfig_InitDLLPath(void) { -#ifdef MS_WINDOWS if (_Py_dll_path == NULL) { /* Already set: nothing to do */ return _PyStatus_OK(); @@ -165,9 +165,9 @@ _PyPathConfig_Init(void) if (_Py_dll_path == NULL) { return _PyStatus_NO_MEMORY(); } -#endif return _PyStatus_OK(); } +#endif static PyStatus @@ -217,6 +217,20 @@ done: } +PyStatus +_PyConfig_WritePathConfig(const PyConfig *config) +{ +#ifdef MS_WINDOWS + PyStatus status = _PyPathConfig_InitDLLPath(); + if (_PyStatus_EXCEPTION(status)) { + return status; + } +#endif + + return pathconfig_set_from_config(&_Py_path_config, config); +} + + static PyStatus config_init_module_search_paths(PyConfig *config, _PyPathConfig *pathconfig) { @@ -441,11 +455,12 @@ pathconfig_global_init(void) { PyStatus status; - /* Initialize _Py_dll_path if needed */ - status = _PyPathConfig_Init(); +#ifdef MS_WINDOWS + status = _PyPathConfig_InitDLLPath(); if (_PyStatus_EXCEPTION(status)) { Py_ExitStatusException(status); } +#endif if (_Py_path_config.module_search_path == NULL) { status = pathconfig_global_read(&_Py_path_config); diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index e5b6283d8d..eed583a4fd 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -475,7 +475,7 @@ pyinit_core_reconfigure(_PyRuntimeState *runtime, config = &interp->config; if (config->_install_importlib) { - status = _PyPathConfig_Init(); + status = _PyConfig_WritePathConfig(config); if (_PyStatus_EXCEPTION(status)) { return status; } @@ -646,7 +646,7 @@ pycore_init_import_warnings(PyThreadState *tstate, PyObject *sysmod) } if (config->_install_importlib) { - status = _PyPathConfig_Init(); + status = _PyConfig_WritePathConfig(config); if (_PyStatus_EXCEPTION(status)) { return status; } |