diff options
| author | Victor Stinner <vstinner@redhat.com> | 2018-09-17 23:22:29 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-17 23:22:29 (GMT) |
| commit | 7a0791b6992d420dc52536257f2f093851ed7215 (patch) | |
| tree | d41edd6bc79c92232213480fc853dd86530780bf /Programs | |
| parent | 1fa2ec49bec50bea1847b558b883c5c904334734 (diff) | |
| download | cpython-7a0791b6992d420dc52536257f2f093851ed7215.zip cpython-7a0791b6992d420dc52536257f2f093851ed7215.tar.gz cpython-7a0791b6992d420dc52536257f2f093851ed7215.tar.bz2 | |
bpo-34589: C locale coercion off by default (GH-9073)
Py_Initialize() and Py_Main() cannot enable the C locale coercion
(PEP 538) anymore: it is always disabled. It can now only be enabled
by the Python program ("python3).
test_embed: get_filesystem_encoding() doesn't have to set PYTHONUTF8
nor PYTHONCOERCECLOCALE, these variables are already set in the
parent.
Diffstat (limited to 'Programs')
| -rw-r--r-- | Programs/_testembed.c | 5 | ||||
| -rw-r--r-- | Programs/python.c | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/Programs/_testembed.c b/Programs/_testembed.c index 1288032..b939469 100644 --- a/Programs/_testembed.c +++ b/Programs/_testembed.c @@ -482,8 +482,6 @@ static int test_init_from_config(void) putenv("PYTHONMALLOCSTATS=0"); config.malloc_stats = 1; - /* FIXME: test _coerce_c_locale and _coerce_c_locale_warn */ - putenv("PYTHONUTF8=0"); Py_UTF8Mode = 0; config.utf8_mode = 1; @@ -606,8 +604,7 @@ static int test_init_isolated(void) /* Test _PyCoreConfig.isolated=1 */ _PyCoreConfig config = _PyCoreConfig_INIT; - /* Set _coerce_c_locale and utf8_mode to not depend on the locale */ - config._coerce_c_locale = 0; + /* Set utf8_mode to not depend on the locale */ config.utf8_mode = 0; /* Use path starting with "./" avoids a search along the PATH */ config.program_name = L"./_testembed"; diff --git a/Programs/python.c b/Programs/python.c index 78e48f8..c7697fa 100644 --- a/Programs/python.c +++ b/Programs/python.c @@ -6,7 +6,7 @@ int wmain(int argc, wchar_t **argv) { - return Py_Main(argc, argv); + return _Py_WindowsMain(argc, argv); } #else int |