diff options
| author | Victor Stinner <vstinner@redhat.com> | 2018-07-21 00:06:16 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-21 00:06:16 (GMT) |
| commit | b1147e43daeb3c51a63056b489e8d868404d4e22 (patch) | |
| tree | c5716fcfca0f90abbc21b291cd51b0ae022759c4 /Include/pylifecycle.h | |
| parent | 94487d45707772723ef19e86700a40a12743baa1 (diff) | |
| download | cpython-b1147e43daeb3c51a63056b489e8d868404d4e22.zip cpython-b1147e43daeb3c51a63056b489e8d868404d4e22.tar.gz cpython-b1147e43daeb3c51a63056b489e8d868404d4e22.tar.bz2 | |
bpo-34170: Rework _PyCoreConfig_Read() to avoid side effect (GH-8353)
Rework _PyCoreConfig_Read() function which *reads* core configuration
to not *modify* the path configuration.
A new _PyCoreConfig_SetPathConfig() function now recreates the path
configuration from the core configuration. This function is now
called very late in _Py_InitializeCore(), just before calling
initimport().
Changes:
* Add _PyCoreConfig.dll_path
* Py_SetPath() now fails with a fatal python error on memory
allocation failure.
* Rename _PyPathConfig_Calculate() to _PyPathConfig_Calculate_impl()
* Replace _PyPathConfig_Init() with _PyPathConfig_Calculate(): the
function now requires a _PyPathConfig
* Add _PyPathConfig_SetGlobal() to set the _Py_path_config global
variable.
* Add _PyCoreConfig_InitPathConfig(): compute the path configuration
* Add _PyCoreConfig_SetPathConfig(): set path configuration from core
configuration
* Rename wstrlist_append() to _Py_wstrlist_append()
* _Py_wstrlist_append() now handles integer overflow.
Diffstat (limited to 'Include/pylifecycle.h')
| -rw-r--r-- | Include/pylifecycle.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Include/pylifecycle.h b/Include/pylifecycle.h index 95dd55b..9644116 100644 --- a/Include/pylifecycle.h +++ b/Include/pylifecycle.h @@ -59,6 +59,9 @@ PyAPI_FUNC(void) _PyCoreConfig_Clear(_PyCoreConfig *); PyAPI_FUNC(int) _PyCoreConfig_Copy( _PyCoreConfig *config, const _PyCoreConfig *config2); +PyAPI_FUNC(_PyInitError) _PyCoreConfig_InitPathConfig(_PyCoreConfig *config); +PyAPI_FUNC(_PyInitError) _PyCoreConfig_SetPathConfig( + const _PyCoreConfig *config); PyAPI_FUNC(_PyInitError) _PyMainInterpreterConfig_Read( _PyMainInterpreterConfig *config, @@ -116,7 +119,11 @@ 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(_PyInitError) _PyPathConfig_Init(const _PyCoreConfig *core_config); +struct _PyPathConfig; +typedef struct _PyPathConfig _PyPathConfig; + +PyAPI_FUNC(_PyInitError) _PyPathConfig_SetGlobal( + const _PyPathConfig *config); PyAPI_FUNC(PyObject*) _PyPathConfig_ComputeArgv0(int argc, wchar_t **argv); PyAPI_FUNC(int) _Py_FindEnvConfigValue( FILE *env_file, |