diff options
| author | Victor Stinner <vstinner@redhat.com> | 2019-03-06 00:44:31 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-06 00:44:31 (GMT) |
| commit | 4fffd380a4070aff39b7fd443d90e60746c1b623 (patch) | |
| tree | 2128ef8300deb023c117151905b1a822157761d9 /Python/pylifecycle.c | |
| parent | c656e25667c9acc0d13e5bb16d3df2938d0f614b (diff) | |
| download | cpython-4fffd380a4070aff39b7fd443d90e60746c1b623.zip cpython-4fffd380a4070aff39b7fd443d90e60746c1b623.tar.gz cpython-4fffd380a4070aff39b7fd443d90e60746c1b623.tar.bz2 | |
bpo-36142: _PyPreConfig_Read() sets LC_CTYPE (GH-12188)
* _PyPreConfig_Read() now sets temporarily LC_CTYPE to the user
preferred locale, as _PyPreConfig_Write() will do permanentely.
* Fix _PyCoreConfig_Clear(): clear run_xxx attributes
* _Py_SetArgcArgv() doesn't have to be exported
* _PyCoreConfig_SetGlobalConfig() no longer applies preconfig
Diffstat (limited to 'Python/pylifecycle.c')
| -rw-r--r-- | Python/pylifecycle.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index 522a427..0810729 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -716,9 +716,6 @@ _Py_InitializeCore_impl(PyInterpreterState **interp_p, static _PyInitError pyinit_preconfig(_PyPreConfig *preconfig, const _PyPreConfig *src_preconfig) { - /* Set LC_CTYPE to the user preferred locale */ - _Py_SetLocaleFromEnv(LC_CTYPE); - if (_PyPreConfig_Copy(preconfig, src_preconfig) < 0) { return _Py_INIT_ERR("failed to copy pre config"); } @@ -736,10 +733,6 @@ static _PyInitError pyinit_coreconfig(_PyCoreConfig *config, const _PyCoreConfig *src_config, PyInterpreterState **interp_p) { - - /* Set LC_CTYPE to the user preferred locale */ - _Py_SetLocaleFromEnv(LC_CTYPE); - if (_PyCoreConfig_Copy(config, src_config) < 0) { return _Py_INIT_ERR("failed to copy core config"); } |