[Python-checkins] bpo-36763: Add _PyCoreConfig_SetArgv() (GH-13030)

Tue Apr 30 20:30:15 EDT 2019

https://github.com/python/cpython/commit/5f38b8407b071acd96da2c8cde411d0e26967735
commit: 5f38b8407b071acd96da2c8cde411d0e26967735
branch: master
author: Victor Stinner <vstinner at redhat.com>
committer: GitHub <noreply at github.com>
date: 2019年05月01日T02:30:12+02:00
summary:
bpo-36763: Add _PyCoreConfig_SetArgv() (GH-13030)
* Add 2 new config methods:
 * _PyCoreConfig_SetArgv()
 * _PyCoreConfig_SetWideArgv()
* Add also an internal _PyCoreConfig_SetPyArgv() method.
* Remove 'args' parameter from _PyCoreConfig_Read().
files:
M Include/internal/pycore_coreconfig.h
M Lib/test/pythoninfo.py
M Python/coreconfig.c
M Python/pathconfig.c
M Python/pylifecycle.c

diff --git a/Include/internal/pycore_coreconfig.h b/Include/internal/pycore_coreconfig.h
index ac98e00159ce..b1d02eef4513 100644
--- a/Include/internal/pycore_coreconfig.h
+++ b/Include/internal/pycore_coreconfig.h
@@ -108,11 +108,21 @@ PyAPI_FUNC(int) _PyCoreConfig_Copy(
 PyAPI_FUNC(_PyInitError) _PyCoreConfig_InitPathConfig(_PyCoreConfig *config);
 PyAPI_FUNC(_PyInitError) _PyCoreConfig_SetPathConfig(
 const _PyCoreConfig *config);
-PyAPI_FUNC(_PyInitError) _PyCoreConfig_Read(_PyCoreConfig *config,
- const _PyArgv *args);
+PyAPI_FUNC(_PyInitError) _PyCoreConfig_Read(_PyCoreConfig *config);
 PyAPI_FUNC(void) _PyCoreConfig_Write(const _PyCoreConfig *config,
 _PyRuntimeState *runtime);
 
+PyAPI_FUNC(_PyInitError) _PyCoreConfig_SetPyArgv(
+ _PyCoreConfig *config,
+ const _PyArgv *args);
+PyAPI_FUNC(_PyInitError) _PyCoreConfig_SetArgv(
+ _PyCoreConfig *config,
+ int argc,
+ char **argv);
+PyAPI_FUNC(_PyInitError) _PyCoreConfig_SetWideArgv(_PyCoreConfig *config,
+ int argc,
+ wchar_t **argv);
+
 
 /* --- Function used for testing ---------------------------------- */
 
diff --git a/Lib/test/pythoninfo.py b/Lib/test/pythoninfo.py
index 580956633f4d..e9edf675b910 100644
--- a/Lib/test/pythoninfo.py
+++ b/Lib/test/pythoninfo.py
@@ -602,8 +602,7 @@ def collect_gdbm(info_add):
 
 
 def collect_get_config(info_add):
- # Dump global configuration variables, _PyCoreConfig
- # and _PyMainInterpreterConfig
+ # Get global configuration variables, _PyPreConfig and _PyCoreConfig
 try:
 from _testinternalcapi import get_configs
 except ImportError:
diff --git a/Python/coreconfig.c b/Python/coreconfig.c
index 471d5126f803..750676a4731c 100644
--- a/Python/coreconfig.c
+++ b/Python/coreconfig.c
@@ -2003,8 +2003,7 @@ config_init_argv(_PyCoreConfig *config, const _PyPreCmdline *cmdline)
 
 
 static _PyInitError
-core_read_precmdline(_PyCoreConfig *config, const _PyArgv *args,
- _PyPreCmdline *precmdline)
+core_read_precmdline(_PyCoreConfig *config, _PyPreCmdline *precmdline)
 {
 _PyInitError err;
 
@@ -2072,23 +2071,47 @@ config_read_cmdline(_PyCoreConfig *config, _PyPreCmdline *precmdline)
 }
 
 
+_PyInitError
+_PyCoreConfig_SetPyArgv(_PyCoreConfig *config, const _PyArgv *args)
+{
+ return _PyArgv_AsWstrList(args, &config->argv);
+}
+
+
+_PyInitError
+_PyCoreConfig_SetArgv(_PyCoreConfig *config, int argc, char **argv)
+{
+ _PyArgv args = {
+ .argc = argc,
+ .use_bytes_argv = 1,
+ .bytes_argv = argv,
+ .wchar_argv = NULL};
+ return _PyCoreConfig_SetPyArgv(config, &args);
+}
+
+
+_PyInitError
+_PyCoreConfig_SetWideArgv(_PyCoreConfig *config, int argc, wchar_t **argv)
+{
+ _PyArgv args = {
+ .argc = argc,
+ .use_bytes_argv = 0,
+ .bytes_argv = NULL,
+ .wchar_argv = argv};
+ return _PyCoreConfig_SetPyArgv(config, &args);
+}
+
+
 /* Read the configuration into _PyCoreConfig from:
 
 * Command line arguments
 * Environment variables
 * Py_xxx global configuration variables */
 _PyInitError
-_PyCoreConfig_Read(_PyCoreConfig *config, const _PyArgv *args)
+_PyCoreConfig_Read(_PyCoreConfig *config)
 {
 _PyInitError err;
 
- if (args) {
- err = _PyArgv_AsWstrList(args, &config->argv);
- if (_Py_INIT_FAILED(err)) {
- return err;
- }
- }
-
 err = _Py_PreInitializeFromCoreConfig(config);
 if (_Py_INIT_FAILED(err)) {
 return err;
@@ -2097,7 +2120,7 @@ _PyCoreConfig_Read(_PyCoreConfig *config, const _PyArgv *args)
 _PyCoreConfig_GetGlobalConfig(config);
 
 _PyPreCmdline precmdline = _PyPreCmdline_INIT;
- err = core_read_precmdline(config, args, &precmdline);
+ err = core_read_precmdline(config, &precmdline);
 if (_Py_INIT_FAILED(err)) {
 goto done;
 }
diff --git a/Python/pathconfig.c b/Python/pathconfig.c
index 10e141a47de0..7fea7c366786 100644
--- a/Python/pathconfig.c
+++ b/Python/pathconfig.c
@@ -394,7 +394,7 @@ pathconfig_global_init(void)
 _PyInitError err;
 _PyCoreConfig config = _PyCoreConfig_INIT;
 
- err = _PyCoreConfig_Read(&config, NULL);
+ err = _PyCoreConfig_Read(&config);
 if (_Py_INIT_FAILED(err)) {
 goto error;
 }
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
index d93fe065558a..185d4066e50b 100644
--- a/Python/pylifecycle.c
+++ b/Python/pylifecycle.c
@@ -801,13 +801,22 @@ pyinit_coreconfig(_PyRuntimeState *runtime,
 const _PyArgv *args,
 PyInterpreterState **interp_p)
 {
+ _PyInitError err;
+
 if (src_config) {
 if (_PyCoreConfig_Copy(config, src_config) < 0) {
 return _Py_INIT_NO_MEMORY();
 }
 }
 
- _PyInitError err = _PyCoreConfig_Read(config, args);
+ if (args) {
+ err = _PyCoreConfig_SetPyArgv(config, args);
+ if (_Py_INIT_FAILED(err)) {
+ return err;
+ }
+ }
+
+ err = _PyCoreConfig_Read(config);
 if (_Py_INIT_FAILED(err)) {
 return err;
 }
