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 /PC | |
| 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 'PC')
| -rw-r--r-- | PC/getpathp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/PC/getpathp.c b/PC/getpathp.c index b182ae6..1d18fae 100644 --- a/PC/getpathp.c +++ b/PC/getpathp.c @@ -624,7 +624,7 @@ error: static void -calculate_path(_PyCoreConfig *core_config) +calculate_path(_PyMainInterpreterConfig *config) { wchar_t argv0_path[MAXPATHLEN+1]; wchar_t *buf; @@ -637,8 +637,8 @@ calculate_path(_PyCoreConfig *core_config) wchar_t *userpath = NULL; wchar_t zip_path[MAXPATHLEN+1]; - if (core_config) { - envpath = core_config->module_search_path_env; + if (config) { + envpath = config->module_search_path_env; } else if (!Py_IgnoreEnvironmentFlag) { envpath = _wgetenv(L"PYTHONPATH"); @@ -899,10 +899,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; } |