diff options
| author | Victor Stinner <vstinner@redhat.com> | 2019-05-01 00:30:12 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-01 00:30:12 (GMT) |
| commit | 5f38b8407b071acd96da2c8cde411d0e26967735 (patch) | |
| tree | cac8a6046fcef2a6b0f1efb56714c4750c90bdb6 /Python/pylifecycle.c | |
| parent | 463b82a3efe8a6a9f3924a5b37482e961dffe3b8 (diff) | |
| download | cpython-5f38b8407b071acd96da2c8cde411d0e26967735.zip cpython-5f38b8407b071acd96da2c8cde411d0e26967735.tar.gz cpython-5f38b8407b071acd96da2c8cde411d0e26967735.tar.bz2 | |
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().
Diffstat (limited to 'Python/pylifecycle.c')
| -rw-r--r-- | Python/pylifecycle.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index d93fe06..185d406 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; } |