diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2017-11-24 22:55:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-24 22:55:40 +0100 |
| commit | 46972b7bc385ec2bdc7f567bbd22c9e56ffdf003 (patch) | |
| tree | e55f61feac1afb22e18bb33274a5e3f0beec5355 /Include/pystate.h | |
| parent | 84c4b1938fade2b425ac906730beabd413de094d (diff) | |
| download | cpython-git-46972b7bc385ec2bdc7f567bbd22c9e56ffdf003.tar.gz | |
bpo-32030: Add _PyMainInterpreterConfig_ReadEnv() (#4542)
Py_GetPath() and Py_Main() now call
_PyMainInterpreterConfig_ReadEnv() to share the same code to get
environment variables.
Changes:
* Add _PyMainInterpreterConfig_ReadEnv()
* Add _PyMainInterpreterConfig_Clear()
* Add _PyMem_RawWcsdup()
* _PyMainInterpreterConfig: rename pythonhome to home
* Rename _Py_ReadMainInterpreterConfig() to
_PyMainInterpreterConfig_Read()
* Use _Py_INIT_USER_ERR(), instead of _Py_INIT_ERR(), for decoding
errors: the user is able to fix the issue, it's not a bug in
Python. Same change was made in _Py_INIT_NO_MEMORY().
* Remove _Py_GetPythonHomeWithConfig()
Diffstat (limited to 'Include/pystate.h')
| -rw-r--r-- | Include/pystate.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Include/pystate.h b/Include/pystate.h index ab6400cddc..533851fc02 100644 --- a/Include/pystate.h +++ b/Include/pystate.h @@ -60,16 +60,17 @@ typedef struct { */ typedef struct { int install_signal_handlers; - wchar_t *module_search_path_env; /* PYTHONPATH environment variable */ - wchar_t *pythonhome; /* PYTHONHOME environment variable, - see also Py_SetPythonHome(). */ + /* PYTHONPATH environment variable */ + wchar_t *module_search_path_env; + /* PYTHONHOME environment variable, see also Py_SetPythonHome(). */ + wchar_t *home; } _PyMainInterpreterConfig; #define _PyMainInterpreterConfig_INIT \ (_PyMainInterpreterConfig){\ .install_signal_handlers = -1, \ .module_search_path_env = NULL, \ - .pythonhome = NULL} + .home = NULL} typedef struct _is { |