diff options
| author | Victor Stinner <vstinner@redhat.com> | 2019-03-25 17:37:10 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-25 17:37:10 (GMT) |
| commit | a6fbc4e25e1dc7d1c9a26888b9115bc6c2afc101 (patch) | |
| tree | b45a6288d1bb5ac1e1df81a0b8c2fc616bc01f44 /Include/internal | |
| parent | f72346c47537657a287a862305f65eb5d7594fbf (diff) | |
| download | cpython-a6fbc4e25e1dc7d1c9a26888b9115bc6c2afc101.zip cpython-a6fbc4e25e1dc7d1c9a26888b9115bc6c2afc101.tar.gz cpython-a6fbc4e25e1dc7d1c9a26888b9115bc6c2afc101.tar.bz2 | |
bpo-36301: Add _Py_PreInitializeFromConfig() (GH-12536)
* Initialize _PyPreConfig.dev_mode to -1.
* _PyPreConfig_Read(): coreconfig has the priority over preconfig.
* _PyCoreConfig_Read() now calls _PyPreCmdline_Read() internally.
* config_from_cmdline() now pass _PyPreCmdline to config_read().
* Add _PyPreCmdline_Copy().
Diffstat (limited to 'Include/internal')
| -rw-r--r-- | Include/internal/pycore_coreconfig.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/Include/internal/pycore_coreconfig.h b/Include/internal/pycore_coreconfig.h index 949bc9b..d44172e 100644 --- a/Include/internal/pycore_coreconfig.h +++ b/Include/internal/pycore_coreconfig.h @@ -25,11 +25,22 @@ typedef struct { /* Note: _PyPreCmdline_INIT sets other fields to 0/NULL */ PyAPI_FUNC(void) _PyPreCmdline_Clear(_PyPreCmdline *cmdline); +PyAPI_FUNC(int) _PyPreCmdline_Copy(_PyPreCmdline *cmdline, + const _PyPreCmdline *cmdline2); PyAPI_FUNC(_PyInitError) _PyPreCmdline_SetArgv(_PyPreCmdline *cmdline, const _PyArgv *args); +PyAPI_FUNC(void) _PyPreCmdline_GetPreConfig( + _PyPreCmdline *cmdline, + const _PyPreConfig *config); PyAPI_FUNC(void) _PyPreCmdline_SetPreConfig( const _PyPreCmdline *cmdline, _PyPreConfig *config); +PyAPI_FUNC(void) _PyPreCmdline_GetCoreConfig( + _PyPreCmdline *cmdline, + const _PyCoreConfig *config); +PyAPI_FUNC(void) _PyPreCmdline_SetCoreConfig( + const _PyPreCmdline *cmdline, + _PyCoreConfig *config); PyAPI_FUNC(_PyInitError) _PyPreCmdline_Read(_PyPreCmdline *cmdline); @@ -77,7 +88,8 @@ PyAPI_FUNC(void) _Py_get_env_flag(_PyPreConfig *config, int *flag, const char *name); PyAPI_FUNC(_PyInitError) _PyPreConfig_Read(_PyPreConfig *config, - const _PyArgv *args); + const _PyArgv *args, + const _PyCoreConfig *coreconfig); PyAPI_FUNC(int) _PyPreConfig_AsDict(const _PyPreConfig *config, PyObject *dict); PyAPI_FUNC(_PyInitError) _PyPreConfig_ReadFromArgv(_PyPreConfig *config, |