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/Lib/test/test_c_locale_coercion.py b/Lib/test/test_c_locale_coercion.py
index f62208a..1db293b 100644
--- a/Lib/test/test_c_locale_coercion.py
+++ b/Lib/test/test_c_locale_coercion.py
@@ -139,7 +139,7 @@
return data
@classmethod
- def get_child_details(cls, env_vars, xoption=None):
+ def get_child_details(cls, env_vars):
"""Retrieves fsencoding and standard stream details from a child process
Returns (encoding_details, stderr_lines):
@@ -150,11 +150,10 @@
The child is run in isolated mode if the current interpreter supports
that.
"""
- args = []
- if xoption:
- args.extend(("-X", f"coerce_c_locale={xoption}"))
- args.extend(("-X", "utf8=0", "-c", cls.CHILD_PROCESS_SCRIPT))
- result, py_cmd = run_python_until_end(*args, **env_vars)
+ result, py_cmd = run_python_until_end(
+ "-X", "utf8=0", "-c", cls.CHILD_PROCESS_SCRIPT,
+ **env_vars
+ )
if not result.rc == 0:
result.fail(py_cmd)
# All subprocess outputs in this test case should be pure ASCII
@@ -213,8 +212,7 @@
expected_fs_encoding,
expected_stream_encoding,
expected_warnings,
- coercion_expected,
- xoption=None):
+ coercion_expected):
"""Check the C locale handling for the given process environment
Parameters:
@@ -222,7 +220,7 @@
expected_stream_encoding: expected encoding for standard streams
expected_warning: stderr output to expect (if any)
"""
- result = EncodingDetails.get_child_details(env_vars, xoption)
+ result = EncodingDetails.get_child_details(env_vars)
encoding_details, stderr_lines = result
expected_details = EncodingDetails.get_expected_details(
coercion_expected,
@@ -292,7 +290,6 @@
coerce_c_locale,
expected_warnings=None,
coercion_expected=True,
- use_xoption=False,
**extra_vars):
"""Check the C locale handling for various configurations
@@ -322,12 +319,8 @@
"PYTHONCOERCECLOCALE": "",
}
base_var_dict.update(extra_vars)
- xoption = None
if coerce_c_locale is not None:
- if use_xoption:
- xoption = coerce_c_locale
- else:
- base_var_dict["PYTHONCOERCECLOCALE"] = coerce_c_locale
+ base_var_dict["PYTHONCOERCECLOCALE"] = coerce_c_locale
# Check behaviour for the default locale
with self.subTest(default_locale=True,
@@ -349,8 +342,7 @@
fs_encoding,
stream_encoding,
_expected_warnings,
- _coercion_expected,
- xoption=xoption)
+ _coercion_expected)
# Check behaviour for explicitly configured locales
for locale_to_set in EXPECTED_C_LOCALE_EQUIVALENTS:
@@ -365,8 +357,7 @@
fs_encoding,
stream_encoding,
expected_warnings,
- coercion_expected,
- xoption=xoption)
+ coercion_expected)
def test_PYTHONCOERCECLOCALE_not_set(self):
# This should coerce to the first available target locale by default
@@ -413,32 +404,6 @@
expected_warnings=[LEGACY_LOCALE_WARNING],
coercion_expected=False)
- def test_xoption_set_to_1(self):
- self._check_c_locale_coercion("utf-8", "utf-8", coerce_c_locale="1",
- use_xoption=True)
-
- def test_xoption_set_to_zero(self):
- # The setting "0" should result in the locale coercion being disabled
- self._check_c_locale_coercion(EXPECTED_C_LOCALE_FS_ENCODING,
- EXPECTED_C_LOCALE_STREAM_ENCODING,
- coerce_c_locale="0",
- coercion_expected=False,
- use_xoption=True)
- # Setting LC_ALL=C shouldn't make any difference to the behaviour
- self._check_c_locale_coercion(EXPECTED_C_LOCALE_FS_ENCODING,
- EXPECTED_C_LOCALE_STREAM_ENCODING,
- coerce_c_locale="0",
- LC_ALL="C",
- coercion_expected=False,
- use_xoption=True)
-
- def test_xoption_set_to_warn(self):
- # -X coerce_c_locale=warn enables runtime warnings for legacy locales
- self._check_c_locale_coercion("utf-8", "utf-8",
- coerce_c_locale="warn",
- expected_warnings=[CLI_COERCION_WARNING],
- use_xoption=True)
-
def test_main():
test.support.run_unittest(
LocaleConfigurationTests,
diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
index 0424f75..95cdc8d 100644
--- a/Lib/test/test_cmd_line.py
+++ b/Lib/test/test_cmd_line.py
@@ -159,16 +159,13 @@
env = os.environ.copy()
# Use C locale to get ascii for the locale encoding
env['LC_ALL'] = 'C'
+ env['PYTHONCOERCECLOCALE'] = '0'
code = (
b'import locale; '
b'print(ascii("' + undecodable + b'"), '
b'locale.getpreferredencoding())')
p = subprocess.Popen(
- [sys.executable,
- # Disable C locale coercion and UTF-8 Mode to not use UTF-8
- "-X", "coerce_c_locale=0",
- "-X", "utf8=0",
- "-c", code],
+ [sys.executable, "-c", code],
stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
env=env)
stdout, stderr = p.communicate()
diff --git a/Lib/test/test_embed.py b/Lib/test/test_embed.py
index 79c34ec..2927458 100644
--- a/Lib/test/test_embed.py
+++ b/Lib/test/test_embed.py
@@ -267,6 +267,9 @@
'malloc_stats': 0,
'utf8_mode': 0,
+ 'coerce_c_locale': 0,
+ 'coerce_c_locale_warn': 0,
+
'program_name': './_testembed',
'argc': 0,
'argv': '[]',
@@ -287,8 +290,6 @@
'_disable_importlib': 0,
'Py_FrozenFlag': 0,
- '_coerce_c_locale': 0,
- '_coerce_c_locale_warn': 0,
}
def check_config(self, testname, expected):
diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
index 9155afc..27f7590 100644
--- a/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@@ -656,8 +656,9 @@
def c_locale_get_error_handler(self, locale, isolated=False, encoding=None):
# Force the POSIX locale
- env = dict(os.environ)
+ env = os.environ.copy()
env["LC_ALL"] = locale
+ env["PYTHONCOERCECLOCALE"] = "0"
code = '\n'.join((
'import sys',
'def dump(name):',
@@ -667,10 +668,7 @@
'dump("stdout")',
'dump("stderr")',
))
- args = [sys.executable,
- "-X", "utf8=0",
- "-X", "coerce_c_locale=0",
- "-c", code]
+ args = [sys.executable, "-c", code]
if isolated:
args.append("-I")
if encoding is not None:
diff --git a/Lib/test/test_utf8_mode.py b/Lib/test/test_utf8_mode.py
index 8c64276..554abfa 100644
--- a/Lib/test/test_utf8_mode.py
+++ b/Lib/test/test_utf8_mode.py
@@ -27,8 +27,6 @@
return (loc in POSIX_LOCALES)
def get_output(self, *args, failure=False, **kw):
- # Always disable the C locale coercion (PEP 538)
- args = ('-X', 'coerce_c_locale=0', *args)
kw = dict(self.DEFAULT_ENV, **kw)
if failure:
out = assert_python_failure(*args, **kw)
@@ -118,6 +116,7 @@
# PYTHONLEGACYWINDOWSFSENCODING disables the UTF-8 mode
# and has the priority over -X utf8 and PYTHONUTF8
out = self.get_output('-X', 'utf8', '-c', code,
+ PYTHONUTF8='strict',
PYTHONLEGACYWINDOWSFSENCODING='1')
self.assertEqual(out, 'mbcs/replace')