diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2017-12-16 04:54:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-16 04:54:22 +0100 |
| commit | 9454060e84a669dde63824d9e2fcaf295e34f687 (patch) | |
| tree | 4c40a6e1bd11aa75819acb7efce4981fc6ba7611 /Doc/using | |
| parent | e796b2fe26f220107ac50667de6cc86c82b465e3 (diff) | |
| download | cpython-git-9454060e84a669dde63824d9e2fcaf295e34f687.tar.gz | |
bpo-29240, bpo-32030: Py_Main() re-reads config if encoding changes (#4899)
bpo-29240, bpo-32030: If the encoding change (C locale coerced or
UTF-8 Mode changed), Py_Main() now reads again the configuration with
the new encoding.
Changes:
* Add _Py_UnixMain() called by main().
* Rename pymain_free_pymain() to pymain_clear_pymain(), it can now be
called multipled times.
* Rename pymain_parse_cmdline_envvars() to pymain_read_conf().
* Py_Main() now clears orig_argc and orig_argv at exit.
* Remove argv_copy2, Py_Main() doesn't modify argv anymore. There is
no need anymore to get two copies of the wchar_t** argv.
* _PyCoreConfig: add coerce_c_locale and coerce_c_locale_warn.
* Py_UTF8Mode is now initialized to -1.
* Locale coercion (PEP 538) now respects -I and -E options.
Diffstat (limited to 'Doc/using')
| -rw-r--r-- | Doc/using/cmdline.rst | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst index 3915f336a5..b1bd47fa6b 100644 --- a/Doc/using/cmdline.rst +++ b/Doc/using/cmdline.rst @@ -779,9 +779,7 @@ conflict. If set to the value ``0``, causes the main Python command line application to skip coercing the legacy ASCII-based C locale to a more capable UTF-8 - based alternative. Note that this setting is checked even when the - :option:`-E` or :option:`-I` options are used, as it is handled prior to - the processing of command line options. + based alternative. If this variable is *not* set, or is set to a value other than ``0``, and the current locale reported for the ``LC_CTYPE`` category is the default |