mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-36301: Add _Py_PreInitializeFromConfig() (GH-12536)

Browse source 
* 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().
This commit is contained in:
Victor Stinner 2019-03-25 18:37:10 +01:00 • committed by GitHub
parent f72346c475
commit a6fbc4e25e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 156 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

62
Python/coreconfig.c
View file

@ -1336,16 +1336,30 @@ config_init_fs_encoding(_PyCoreConfig *config)
* Py_xxx global configuration variables
See _PyCoreConfig_ReadFromArgv() to parse also command line arguments. */
_PyInitError
_PyCoreConfig_Read(_PyCoreConfig *config)
static _PyInitError
config_read_impl(_PyCoreConfig *config, _PyPreCmdline *cmdline)
{
_PyInitError err;
err = _Py_PreInitialize();
err = _Py_PreInitializeFromConfig(config);
if (_Py_INIT_FAILED(err)) {
return err;
}
_PyPreCmdline_GetPreConfig(cmdline, &_PyRuntime.preconfig);
_PyPreCmdline_GetCoreConfig(cmdline, config);
err = _PyPreCmdline_Read(cmdline);
if (_Py_INIT_FAILED(err)) {
return err;
}
_PyPreCmdline_SetCoreConfig(cmdline, config);
if (_PyWstrList_Extend(&config->xoptions, &cmdline->xoptions) < 0) {
return _Py_INIT_NO_MEMORY();
}
if (_PyPreConfig_Copy(&config->preconfig, &_PyRuntime.preconfig) < 0) {
return _Py_INIT_NO_MEMORY();
}
@ -1454,6 +1468,41 @@ _PyCoreConfig_Read(_PyCoreConfig *config)
}
static _PyInitError
config_read(_PyCoreConfig *config, const _PyPreCmdline *src_cmdline)
{
_PyInitError err;
err = _Py_PreInitializeFromConfig(config);
if (_Py_INIT_FAILED(err)) {
return err;
}
_PyPreCmdline cmdline = _PyPreCmdline_INIT;
if (src_cmdline) {
if (_PyPreCmdline_Copy(&cmdline, src_cmdline) < 0) {
err = _Py_INIT_NO_MEMORY();
goto done;
}
}
err = config_read_impl(config, &cmdline);
done:
_PyPreCmdline_Clear(&cmdline);
return err;
}
_PyInitError
_PyCoreConfig_Read(_PyCoreConfig *config)
{
return config_read(config, NULL);
}
static void
config_init_stdio(const _PyCoreConfig *config)
{
@ -2025,9 +2074,6 @@ config_from_cmdline(_PyCoreConfig *config, _PyCmdline *cmdline)
}
_PyPreCmdline_SetPreConfig(&cmdline->precmdline, &_PyRuntime.preconfig);
if (_PyWstrList_Extend(&config->xoptions, &cmdline->precmdline.xoptions) < 0) {
return _Py_INIT_NO_MEMORY();
}
err = config_parse_cmdline(config, cmdline, &need_usage);
if (_Py_INIT_FAILED(err)) {
@ -2055,7 +2101,7 @@ config_from_cmdline(_PyCoreConfig *config, _PyCmdline *cmdline)
return err;
}
err = _PyCoreConfig_Read(config);
err = config_read(config, &cmdline->precmdline);
if (_Py_INIT_FAILED(err)) {
return err;
}
@ -2090,7 +2136,7 @@ _PyCoreConfig_ReadFromArgv(_PyCoreConfig *config, const _PyArgv *args)
{
_PyInitError err;
err = _Py_PreInitialize();
err = _Py_PreInitializeFromConfig(config);
if (_Py_INIT_FAILED(err)) {
return err;
}