diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2017-11-23 09:43:14 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-23 09:43:14 (GMT) |
| commit | 1f15111a6e15d52f6b08907576ec61493cd59358 (patch) | |
| tree | b1a8fd55a1790e3dfd2026cc238e7344f293af90 /Modules/getpath.c | |
| parent | e32e79f7d8216b78ac9e61bb1f2eee693108d4ee (diff) | |
| download | cpython-1f15111a6e15d52f6b08907576ec61493cd59358.zip cpython-1f15111a6e15d52f6b08907576ec61493cd59358.tar.gz cpython-1f15111a6e15d52f6b08907576ec61493cd59358.tar.bz2 | |
bpo-32030: Add _PyMainInterpreterConfig.pythonhome (#4513)
* Py_Main() now reads the PYTHONHOME environment variable
* Add _Py_GetPythonHomeWithConfig() private function
* Add _PyWarnings_InitWithConfig()
* init_filters() doesn't get the current core configuration from the
current interpreter or Python thread anymore. Pass explicitly the
configuration to _PyWarnings_InitWithConfig().
* _Py_InitializeCore() now fails on _PyWarnings_InitWithConfig()
failure.
* Pass configuration as constant
Diffstat (limited to 'Modules/getpath.c')
| -rw-r--r-- | Modules/getpath.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/getpath.c b/Modules/getpath.c index ead1432..62f5e69 100644 --- a/Modules/getpath.c +++ b/Modules/getpath.c @@ -456,13 +456,13 @@ search_for_exec_prefix(wchar_t *argv0_path, wchar_t *home, } static void -calculate_path(_PyMainInterpreterConfig *config) +calculate_path(const _PyMainInterpreterConfig *config) { extern wchar_t *Py_GetProgramName(void); static const wchar_t delimiter[2] = {DELIM, '\0'}; static const wchar_t separator[2] = {SEP, '\0'}; - wchar_t *home = Py_GetPythonHome(); + wchar_t *home = _Py_GetPythonHomeWithConfig(config); char *_path = getenv("PATH"); wchar_t *path_buffer = NULL; wchar_t *path = NULL; @@ -858,7 +858,7 @@ Py_SetPath(const wchar_t *path) } wchar_t * -_Py_GetPathWithConfig(_PyMainInterpreterConfig *config) +_Py_GetPathWithConfig(const _PyMainInterpreterConfig *config) { if (!module_search_path) { calculate_path(config); |