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().
diff --git a/Python/coreconfig.c b/Python/coreconfig.c
index 130dfcc..ba5abb6 100644
--- a/Python/coreconfig.c
+++ b/Python/coreconfig.c
@@ -1336,16 +1336,30 @@
* 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 @@
}
+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 @@
}
_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 @@
return err;
}
- err = _PyCoreConfig_Read(config);
+ err = config_read(config, &cmdline->precmdline);
if (_Py_INIT_FAILED(err)) {
return err;
}
@@ -2090,7 +2136,7 @@
{
_PyInitError err;
- err = _Py_PreInitialize();
+ err = _Py_PreInitializeFromConfig(config);
if (_Py_INIT_FAILED(err)) {
return err;
}
diff --git a/Python/preconfig.c b/Python/preconfig.c
index c16f340..ac87a7a 100644
--- a/Python/preconfig.c
+++ b/Python/preconfig.c
@@ -110,6 +110,22 @@
}
+int
+_PyPreCmdline_Copy(_PyPreCmdline *cmdline, const _PyPreCmdline *cmdline2)
+{
+ _PyPreCmdline_Clear(cmdline);
+ if (_PyWstrList_Copy(&cmdline->argv, &cmdline2->argv) < 0) {
+ return -1;
+ }
+ if (_PyWstrList_Copy(&cmdline->xoptions, &cmdline2->xoptions) < 0) {
+ return -1;
+ }
+ cmdline->use_environment = cmdline2->use_environment;
+ cmdline->isolated = cmdline2->isolated;
+ return 0;
+}
+
+
_PyInitError
_PyPreCmdline_SetArgv(_PyPreCmdline *cmdline, const _PyArgv *args)
{
@@ -117,7 +133,7 @@
}
-static void
+void
_PyPreCmdline_GetPreConfig(_PyPreCmdline *cmdline, const _PyPreConfig *config)
{
#define COPY_ATTR(ATTR) \
@@ -132,6 +148,36 @@
}
+void
+_PyPreCmdline_GetCoreConfig(_PyPreCmdline *cmdline, const _PyCoreConfig *config)
+{
+#define COPY_ATTR(ATTR) \
+ if (config->preconfig.ATTR != -1) { \
+ cmdline->ATTR = config->preconfig.ATTR; \
+ }
+
+ COPY_ATTR(use_environment);
+ COPY_ATTR(isolated);
+
+#undef COPY_ATTR
+}
+
+
+void
+_PyPreCmdline_SetCoreConfig(const _PyPreCmdline *cmdline, _PyCoreConfig *config)
+{
+#define COPY_ATTR(ATTR) \
+ if (config->preconfig.ATTR == -1 && cmdline->ATTR != -1) { \
+ config->preconfig.ATTR = cmdline->ATTR; \
+ }
+
+ COPY_ATTR(use_environment);
+ COPY_ATTR(isolated);
+
+#undef COPY_ATTR
+}
+
+
/* --- _PyPreConfig ----------------------------------------------- */
void
@@ -628,7 +674,8 @@
See _PyPreConfig_ReadFromArgv() to parse also command line arguments. */
_PyInitError
-_PyPreConfig_Read(_PyPreConfig *config, const _PyArgv *args)
+_PyPreConfig_Read(_PyPreConfig *config, const _PyArgv *args,
+ const _PyCoreConfig *coreconfig)
{
_PyInitError err;
_PyPreCmdline cmdline = _PyPreCmdline_INIT;
@@ -642,8 +689,17 @@
/* Set LC_CTYPE to the user preferred locale */
_Py_SetLocaleFromEnv(LC_CTYPE);
+ _PyPreConfig_GetGlobalConfig(config);
+
_PyPreCmdline_GetPreConfig(&cmdline, config);
+ if (coreconfig) {
+ _PyPreCmdline_GetCoreConfig(&cmdline, coreconfig);
+ if (config->dev_mode == -1) {
+ config->dev_mode = coreconfig->preconfig.dev_mode;
+ }
+ }
+
if (args) {
err = _PyPreCmdline_SetArgv(&cmdline, args);
if (_Py_INIT_FAILED(err)) {
@@ -724,7 +780,7 @@
Py_LegacyWindowsFSEncodingFlag = config->legacy_windows_fs_encoding;
#endif
- err = _PyPreConfig_Read(config, args);
+ err = _PyPreConfig_Read(config, args, NULL);
if (_Py_INIT_FAILED(err)) {
goto done;
}
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
index ea1b731..66cadc9 100644
--- a/Python/pylifecycle.c
+++ b/Python/pylifecycle.c
@@ -715,7 +715,9 @@
static _PyInitError
-pyinit_preinit(_PyPreConfig *config, const _PyPreConfig *src_config)
+pyinit_preinit(_PyPreConfig *config,
+ const _PyPreConfig *src_config,
+ const _PyCoreConfig *coreconfig)
{
_PyInitError err;
@@ -729,13 +731,17 @@
return _Py_INIT_OK();
}
+ if (!src_config && coreconfig) {
+ src_config = &coreconfig->preconfig;
+ }
+
if (src_config) {
if (_PyPreConfig_Copy(config, src_config) < 0) {
return _Py_INIT_ERR("failed to copy pre config");
}
}
- err = _PyPreConfig_Read(config, NULL);
+ err = _PyPreConfig_Read(config, NULL, coreconfig);
if (_Py_INIT_FAILED(err)) {
return err;
}
@@ -751,17 +757,27 @@
_PyInitError
-_Py_PreInitializeFromPreConfig(_PyPreConfig *config)
+_Py_PreInitialize(void)
{
- return pyinit_preinit(config, NULL);
+ _PyPreConfig config = _PyPreConfig_INIT;
+ _PyInitError err = pyinit_preinit(&config, NULL, NULL);
+ _PyPreConfig_Clear(&config);
+ return err;
}
_PyInitError
-_Py_PreInitialize(void)
+_Py_PreInitializeFromPreConfig(_PyPreConfig *config)
+{
+ return pyinit_preinit(config, NULL, NULL);
+}
+
+
+_PyInitError
+_Py_PreInitializeFromConfig(const _PyCoreConfig *coreconfig)
{
_PyPreConfig config = _PyPreConfig_INIT;
- _PyInitError err = pyinit_preinit(&config, NULL);
+ _PyInitError err = pyinit_preinit(&config, NULL, coreconfig);
_PyPreConfig_Clear(&config);
return err;
}
@@ -814,16 +830,13 @@
assert(src_config != NULL);
- _PyCoreConfig local_config = _PyCoreConfig_INIT;
-
- err = pyinit_preinit(&local_config.preconfig, &src_config->preconfig);
+ err = _Py_PreInitializeFromConfig(src_config);
if (_Py_INIT_FAILED(err)) {
- goto done;
+ return err;
}
+ _PyCoreConfig local_config = _PyCoreConfig_INIT;
err = pyinit_coreconfig(&local_config, src_config, interp_p);
-
-done:
_PyCoreConfig_Clear(&local_config);
return err;
}