diff options
| author |   Victor Stinner <victor.stinner@gmail.com> | 2017-11-23 10:43:14 +0100 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2017-11-23 10:43:14 +0100 |
| commit | 1f15111a6e15d52f6b08907576ec61493cd59358 (patch) | |
| tree | b1a8fd55a1790e3dfd2026cc238e7344f293af90 /Include/pylifecycle.h | |
| parent | bpo-32030: Move PYTHONPATH to _PyMainInterpreterConfig (#4511) (diff) | |
| download | cpython-1f15111a6e15d52f6b08907576ec61493cd59358.tar.gz cpython-1f15111a6e15d52f6b08907576ec61493cd59358.tar.bz2 cpython-1f15111a6e15d52f6b08907576ec61493cd59358.zip | |
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 'Include/pylifecycle.h')
| -rw-r--r-- | Include/pylifecycle.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Include/pylifecycle.h b/Include/pylifecycle.h index 5eaa74edab8..3b603c87ad4 100644 --- a/Include/pylifecycle.h +++ b/Include/pylifecycle.h @@ -12,6 +12,10 @@ PyAPI_FUNC(wchar_t *) Py_GetProgramName(void); PyAPI_FUNC(void) Py_SetPythonHome(wchar_t *); PyAPI_FUNC(wchar_t *) Py_GetPythonHome(void); +#ifdef Py_BUILD_CORE +PyAPI_FUNC(wchar_t *) _Py_GetPythonHomeWithConfig( + const _PyMainInterpreterConfig *config); +#endif #ifndef Py_LIMITED_API /* Only used by applications that embed the interpreter and need to @@ -94,7 +98,8 @@ PyAPI_FUNC(wchar_t *) Py_GetPrefix(void); PyAPI_FUNC(wchar_t *) Py_GetExecPrefix(void); PyAPI_FUNC(wchar_t *) Py_GetPath(void); #ifdef Py_BUILD_CORE -PyAPI_FUNC(wchar_t *) _Py_GetPathWithConfig(_PyMainInterpreterConfig *config); +PyAPI_FUNC(wchar_t *) _Py_GetPathWithConfig( + const _PyMainInterpreterConfig *config); #endif PyAPI_FUNC(void) Py_SetPath(const wchar_t *); #ifdef MS_WINDOWS |