diff options
author | Victor Stinner <vstinner@redhat.com> | 2018-09-19 21:56:36 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-19 21:56:36 (GMT) |
commit | 06e7608207daab9fb82d13ccf2d3664535442f11 (patch) | |
tree | 690da78834ebfbe2f3f0316972bfcbde97a67a8f /Doc/using | |
parent | 76531e2e82319a487d659bc469441bd4b8251608 (diff) | |
download | cpython-06e7608207daab9fb82d13ccf2d3664535442f11.zip cpython-06e7608207daab9fb82d13ccf2d3664535442f11.tar.gz cpython-06e7608207daab9fb82d13ccf2d3664535442f11.tar.bz2 |
Revert "bpo-34589: Add -X coerce_c_locale command line option (GH-9378)" (GH-9430)
* Revert "bpo-34589: Add -X coerce_c_locale command line option (GH-9378)"
This reverts commit dbdee0073cf0b88fe541980ace1f650900f455cc.
* Revert "bpo-34589: C locale coercion off by default (GH-9073)"
This reverts commit 7a0791b6992d420dc52536257f2f093851ed7215.
* Revert "bpo-34589: Make _PyCoreConfig.coerce_c_locale private (GH-9371)"
This reverts commit 188ebfa475a6f6aa2d0ea14ca8e1fbe7865b6d27.
Diffstat (limited to 'Doc/using')
-rw-r--r-- | Doc/using/cmdline.rst | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst index cd3b241..b61df8a 100644 --- a/Doc/using/cmdline.rst +++ b/Doc/using/cmdline.rst @@ -438,22 +438,13 @@ Miscellaneous options * Set the :attr:`~sys.flags.dev_mode` attribute of :attr:`sys.flags` to ``True`` - * ``-X utf8`` enables UTF-8 mode (:pep:`540`) for operating system interfaces, overriding + * ``-X utf8`` enables UTF-8 mode for operating system interfaces, overriding the default locale-aware mode. ``-X utf8=0`` explicitly disables UTF-8 mode (even when it would otherwise activate automatically). See :envvar:`PYTHONUTF8` for more details. * ``-X pycache_prefix=PATH`` enables writing ``.pyc`` files to a parallel tree rooted at the given directory instead of to the code tree. See also :envvar:`PYTHONPYCACHEPREFIX`. - * ``-X coerce_c_locale`` or ``-X coerce_c_locale=1`` tries to coerce the C - locale (:pep:`538`). - ``-X coerce_c_locale=0`` skips coercing the legacy ASCII-based C and POSIX - locales to a more capable UTF-8 based alternative. - ``-X coerce_c_locale=warn`` will cause Python to emit warning messages on - ``stderr`` if either the locale coercion activates, or else if a locale - that *would* have triggered coercion is still active when the Python - runtime is initialized. - See :envvar:`PYTHONCOERCECLOCALE` for more details. It also allows passing arbitrary values and retrieving them through the :data:`sys._xoptions` dictionary. @@ -473,9 +464,6 @@ Miscellaneous options .. versionadded:: 3.7 The ``-X importtime``, ``-X dev`` and ``-X utf8`` options. - .. versionadded:: 3.7.1 - The ``-X coerce_c_locale`` option. - .. versionadded:: 3.8 The ``-X pycache_prefix`` option. @@ -862,8 +850,6 @@ conflict. order to force the interpreter to use ``ASCII`` instead of ``UTF-8`` for system interfaces. - Also available as the :option:`-X` ``coerce_c_locale`` option. - Availability: \*nix .. versionadded:: 3.7 |