diff options
| author | Victor Stinner <vstinner@redhat.com> | 2019-03-27 12:40:14 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-27 12:40:14 (GMT) |
| commit | 5ac27a50ff2b42216746fedc0522a92c53089bb3 (patch) | |
| tree | 5fbf53a0b5e47f6704f01397de3e01799bf87d41 /Programs | |
| parent | 364f0b0f19cc3f0d5e63f571ec9163cf41c62958 (diff) | |
| download | cpython-5ac27a50ff2b42216746fedc0522a92c53089bb3.zip cpython-5ac27a50ff2b42216746fedc0522a92c53089bb3.tar.gz cpython-5ac27a50ff2b42216746fedc0522a92c53089bb3.tar.bz2 | |
bpo-36444: Rework _Py_InitializeFromConfig() API (GH-12576)
Diffstat (limited to 'Programs')
| -rw-r--r-- | Programs/_freeze_importlib.c | 2 | ||||
| -rw-r--r-- | Programs/_testembed.c | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/Programs/_freeze_importlib.c b/Programs/_freeze_importlib.c index 774748d..6f77e86 100644 --- a/Programs/_freeze_importlib.c +++ b/Programs/_freeze_importlib.c @@ -86,7 +86,7 @@ main(int argc, char *argv[]) config._frozen = 1; config._init_main = 0; - _PyInitError err = _Py_InitializeFromConfig(&config, NULL); + _PyInitError err = _Py_InitializeFromConfig(&config); /* No need to call _PyCoreConfig_Clear() since we didn't allocate any memory: program_name is a constant string. */ if (_Py_INIT_FAILED(err)) { diff --git a/Programs/_testembed.c b/Programs/_testembed.c index 7058799..425954c 100644 --- a/Programs/_testembed.c +++ b/Programs/_testembed.c @@ -408,7 +408,7 @@ static int test_init_from_config(void) Py_UTF8Mode = 0; preconfig.utf8_mode = 1; - err = _Py_PreInitializeFromPreConfig(&preconfig); + err = _Py_PreInitialize(&preconfig); if (_Py_INIT_FAILED(err)) { _Py_ExitInitError(err); } @@ -529,7 +529,7 @@ static int test_init_from_config(void) Py_FrozenFlag = 0; config._frozen = 1; - err = _Py_InitializeFromConfig(&config, NULL); + err = _Py_InitializeFromConfig(&config); /* Don't call _PyCoreConfig_Clear() since all strings are static */ if (_Py_INIT_FAILED(err)) { _Py_ExitInitError(err); @@ -623,7 +623,7 @@ static int test_init_isolated(void) preconfig.coerce_c_locale = 0; preconfig.utf8_mode = 0; - err = _Py_PreInitializeFromPreConfig(&preconfig); + err = _Py_PreInitialize(&preconfig); if (_Py_INIT_FAILED(err)) { _Py_ExitInitError(err); } @@ -638,7 +638,7 @@ static int test_init_isolated(void) config.program_name = L"./_testembed"; test_init_env_dev_mode_putenvs(); - err = _Py_InitializeFromConfig(&config, NULL); + err = _Py_InitializeFromConfig(&config); if (_Py_INIT_FAILED(err)) { _Py_ExitInitError(err); } @@ -660,7 +660,7 @@ static int test_preinit_isolated1(void) preconfig.utf8_mode = 0; preconfig.isolated = 1; - err = _Py_PreInitializeFromPreConfig(&preconfig); + err = _Py_PreInitialize(&preconfig); if (_Py_INIT_FAILED(err)) { _Py_ExitInitError(err); } @@ -669,7 +669,7 @@ static int test_preinit_isolated1(void) config.program_name = L"./_testembed"; test_init_env_dev_mode_putenvs(); - err = _Py_InitializeFromConfig(&config, NULL); + err = _Py_InitializeFromConfig(&config); if (_Py_INIT_FAILED(err)) { _Py_ExitInitError(err); } @@ -691,7 +691,7 @@ static int test_preinit_isolated2(void) preconfig.utf8_mode = 0; preconfig.isolated = 0; - err = _Py_PreInitializeFromPreConfig(&preconfig); + err = _Py_PreInitialize(&preconfig); if (_Py_INIT_FAILED(err)) { _Py_ExitInitError(err); } @@ -706,7 +706,7 @@ static int test_preinit_isolated2(void) config.program_name = L"./_testembed"; test_init_env_dev_mode_putenvs(); - err = _Py_InitializeFromConfig(&config, NULL); + err = _Py_InitializeFromConfig(&config); if (_Py_INIT_FAILED(err)) { _Py_ExitInitError(err); } @@ -723,7 +723,7 @@ static int test_init_dev_mode(void) putenv("PYTHONMALLOC="); config.dev_mode = 1; config.program_name = L"./_testembed"; - _PyInitError err = _Py_InitializeFromConfig(&config, NULL); + _PyInitError err = _Py_InitializeFromConfig(&config); if (_Py_INIT_FAILED(err)) { _Py_ExitInitError(err); } |