diff options
| author | Victor Stinner <vstinner@redhat.com> | 2019-03-26 01:31:11 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-26 01:31:11 (GMT) |
| commit | 20004959d23d07ac784eef51ecb161012180faa8 (patch) | |
| tree | 7fcc04b0924c2180d234196d3886e58cb57e2609 /Include/cpython | |
| parent | f78a5e9ce8f32a195f5f788aade79578437f30a6 (diff) | |
| download | cpython-20004959d23d07ac784eef51ecb161012180faa8.zip cpython-20004959d23d07ac784eef51ecb161012180faa8.tar.gz cpython-20004959d23d07ac784eef51ecb161012180faa8.tar.bz2 | |
bpo-36301: Remove _PyCoreConfig.preconfig (GH-12546)
* Replace _PyCoreConfig.preconfig with 3 new fields in _PyCoreConfig:
isolated, use_environment, dev_mode.
* Add _PyPreCmdline.dev_mode.
* Add _Py_PreInitializeFromPreConfigInPlace().
Diffstat (limited to 'Include/cpython')
| -rw-r--r-- | Include/cpython/coreconfig.h | 8 | ||||
| -rw-r--r-- | Include/cpython/pylifecycle.h | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/Include/cpython/coreconfig.h b/Include/cpython/coreconfig.h index 621a09f..827a19a 100644 --- a/Include/cpython/coreconfig.h +++ b/Include/cpython/coreconfig.h @@ -123,7 +123,9 @@ typedef struct { /* --- _PyCoreConfig ---------------------------------------------- */ typedef struct { - _PyPreConfig preconfig; + int isolated; + int use_environment; + int dev_mode; /* Install signal handlers? Yes by default. */ int install_signal_handlers; @@ -375,7 +377,9 @@ typedef struct { #define _PyCoreConfig_INIT \ (_PyCoreConfig){ \ _PyCoreConfig_WINDOWS_INIT \ - .preconfig = _PyPreConfig_INIT, \ + .isolated = -1, \ + .use_environment = -1, \ + .dev_mode = -1, \ .install_signal_handlers = 1, \ .use_hash_seed = -1, \ .faulthandler = -1, \ diff --git a/Include/cpython/pylifecycle.h b/Include/cpython/pylifecycle.h index 5f3a522..e32e54c 100644 --- a/Include/cpython/pylifecycle.h +++ b/Include/cpython/pylifecycle.h @@ -16,7 +16,7 @@ PyAPI_FUNC(int) Py_SetStandardStreamEncoding(const char *encoding, PyAPI_FUNC(_PyInitError) _Py_PreInitialize(void); PyAPI_FUNC(_PyInitError) _Py_PreInitializeFromPreConfig( - _PyPreConfig *preconfig); + const _PyPreConfig *preconfig); PyAPI_FUNC(_PyInitError) _Py_PreInitializeFromConfig( const _PyCoreConfig *coreconfig); |