diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2017-11-23 00:49:45 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-23 00:49:45 (GMT) |
| commit | e32e79f7d8216b78ac9e61bb1f2eee693108d4ee (patch) | |
| tree | f37f8a85b01f24f9f368dbec764ef38fee0229c2 /Modules/getpath.c | |
| parent | 0784a2e5b174d2dbf7b144d480559e650c5cf64c (diff) | |
| download | cpython-e32e79f7d8216b78ac9e61bb1f2eee693108d4ee.zip cpython-e32e79f7d8216b78ac9e61bb1f2eee693108d4ee.tar.gz cpython-e32e79f7d8216b78ac9e61bb1f2eee693108d4ee.tar.bz2 | |
bpo-32030: Move PYTHONPATH to _PyMainInterpreterConfig (#4511)
Move _PyCoreConfig.module_search_path_env to _PyMainInterpreterConfig
structure.
Diffstat (limited to 'Modules/getpath.c')
| -rw-r--r-- | Modules/getpath.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Modules/getpath.c b/Modules/getpath.c index ad4a4e5..ead1432 100644 --- a/Modules/getpath.c +++ b/Modules/getpath.c @@ -456,7 +456,7 @@ search_for_exec_prefix(wchar_t *argv0_path, wchar_t *home, } static void -calculate_path(_PyCoreConfig *core_config) +calculate_path(_PyMainInterpreterConfig *config) { extern wchar_t *Py_GetProgramName(void); @@ -706,9 +706,9 @@ calculate_path(_PyCoreConfig *core_config) bufsz = 0; wchar_t *env_path = NULL; - if (core_config) { - if (core_config->module_search_path_env) { - bufsz += wcslen(core_config->module_search_path_env) + 1; + if (config) { + if (config->module_search_path_env) { + bufsz += wcslen(config->module_search_path_env) + 1; } } else { @@ -752,9 +752,9 @@ calculate_path(_PyCoreConfig *core_config) /* Run-time value of $PYTHONPATH goes first */ buf[0] = '\0'; - if (core_config) { - if (core_config->module_search_path_env) { - wcscpy(buf, core_config->module_search_path_env); + if (config) { + if (config->module_search_path_env) { + wcscpy(buf, config->module_search_path_env); wcscat(buf, delimiter); } } @@ -858,10 +858,10 @@ Py_SetPath(const wchar_t *path) } wchar_t * -_Py_GetPathWithConfig(_PyCoreConfig *core_config) +_Py_GetPathWithConfig(_PyMainInterpreterConfig *config) { if (!module_search_path) { - calculate_path(core_config); + calculate_path(config); } return module_search_path; } |