Revert "[3.7] bpo-34589: Add -X coerce_c_locale option; C locale coercion off by default (GH-9379)" (GH-9416)
This reverts commit 144f1e2c6f4a24bd288c045986842c65cc289684.
diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index 29de155..70e8d1a 100644
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -438,19 +438,10 @@
* 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 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.
@@ -470,9 +461,6 @@
.. versionadded:: 3.7
The ``-X importtime``, ``-X dev`` and ``-X utf8`` options.
- .. versionadded:: 3.7.1
- The ``-X coerce_c_locale`` option.
-
Options you shouldn't use
~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -846,8 +834,6 @@
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
diff --git a/Doc/whatsnew/3.7.rst b/Doc/whatsnew/3.7.rst
index 6cd9d46..f53a026 100644
--- a/Doc/whatsnew/3.7.rst
+++ b/Doc/whatsnew/3.7.rst
@@ -2494,10 +2494,3 @@
while in Python 3.7.0 it didn't read any of them due to :issue:`34247`). If
this behavior is unwanted, set :c:data:`Py_IgnoreEnvironmentFlag` to 1 before
calling :c:func:`Py_Initialize`.
-
-:c:func:`Py_Initialize` and :c:func:`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).
-
-New :option:`-X` ``coerce_c_locale`` command line option to control C locale
-coercion (:pep:`538`).