diff options
| author | Victor Stinner <vstinner@redhat.com> | 2019-03-25 16:54:58 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-25 16:54:58 (GMT) |
| commit | f72346c47537657a287a862305f65eb5d7594fbf (patch) | |
| tree | d97a19e2a156c04623bcefd32a16b851798a53af /Include/internal | |
| parent | 68d228f174ceed151200e7e0b44ffc5edd4e0ea2 (diff) | |
| download | cpython-f72346c47537657a287a862305f65eb5d7594fbf.zip cpython-f72346c47537657a287a862305f65eb5d7594fbf.tar.gz cpython-f72346c47537657a287a862305f65eb5d7594fbf.tar.bz2 | |
bpo-36301: Cleanup preconfig code (GH-12535)
Prepare code to move some _PyPreConfig parameters into _PyPreCmdline.
Changes:
* _PyCoreConfig_ReadFromArgv(): remove preconfig parameter,
use _PyRuntime.preconfig.
* Add _PyPreCmdline_GetPreConfig() (called by _PyPreConfig_Read()).
* Rename _PyPreCmdline_Init() to _PyPreCmdline_SetArgv()
* Factorize _Py_PreInitializeFromPreConfig() code: add
pyinit_preinit().
* _PyPreConfig_Read() now sets coerce_c_locale to 2 if it must be
coerced.
* Remove _PyCoreConfig_ReadPreConfig().
* _PyCoreConfig_Write() now copies updated preconfig into _PyRuntime.
Diffstat (limited to 'Include/internal')
| -rw-r--r-- | Include/internal/pycore_coreconfig.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/Include/internal/pycore_coreconfig.h b/Include/internal/pycore_coreconfig.h index 29261df..949bc9b 100644 --- a/Include/internal/pycore_coreconfig.h +++ b/Include/internal/pycore_coreconfig.h @@ -25,12 +25,12 @@ typedef struct { /* Note: _PyPreCmdline_INIT sets other fields to 0/NULL */ PyAPI_FUNC(void) _PyPreCmdline_Clear(_PyPreCmdline *cmdline); -PyAPI_FUNC(_PyInitError) _PyPreCmdline_Init(_PyPreCmdline *cmdline, +PyAPI_FUNC(_PyInitError) _PyPreCmdline_SetArgv(_PyPreCmdline *cmdline, const _PyArgv *args); -PyAPI_FUNC(_PyInitError) _PyPreCmdline_Read(_PyPreCmdline *cmdline); PyAPI_FUNC(void) _PyPreCmdline_SetPreConfig( const _PyPreCmdline *cmdline, _PyPreConfig *config); +PyAPI_FUNC(_PyInitError) _PyPreCmdline_Read(_PyPreCmdline *cmdline); /* --- _PyWstrList ------------------------------------------------ */ @@ -76,7 +76,8 @@ PyAPI_FUNC(const char*) _PyPreConfig_GetEnv(const _PyPreConfig *config, PyAPI_FUNC(void) _Py_get_env_flag(_PyPreConfig *config, int *flag, const char *name); -PyAPI_FUNC(_PyInitError) _PyPreConfig_Read(_PyPreConfig *config); +PyAPI_FUNC(_PyInitError) _PyPreConfig_Read(_PyPreConfig *config, + const _PyArgv *args); PyAPI_FUNC(int) _PyPreConfig_AsDict(const _PyPreConfig *config, PyObject *dict); PyAPI_FUNC(_PyInitError) _PyPreConfig_ReadFromArgv(_PyPreConfig *config, @@ -103,12 +104,10 @@ PyAPI_FUNC(int) _PyCoreConfig_GetEnvDup( wchar_t **dest, wchar_t *wname, char *name); -PyAPI_FUNC(_PyInitError) _PyCoreConfig_Read(_PyCoreConfig *config, - const _PyPreConfig *preconfig); +PyAPI_FUNC(_PyInitError) _PyCoreConfig_Read(_PyCoreConfig *config); PyAPI_FUNC(_PyInitError) _PyCoreConfig_ReadFromArgv(_PyCoreConfig *config, - const _PyArgv *args, - const _PyPreConfig *preconfig); -PyAPI_FUNC(void) _PyCoreConfig_Write(const _PyCoreConfig *config); + const _PyArgv *args); +PyAPI_FUNC(_PyInitError) _PyCoreConfig_Write(const _PyCoreConfig *config); #ifdef __cplusplus } |