Skip to content

bpo-28180: assume UTF-8 for Mac OS X PEP 538 tests #2130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ncoghlan merged 3 commits into from
Jun 13, 2017
Merged

bpo-28180: assume UTF-8 for Mac OS X PEP 538 tests #2130

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a6395bb
PEP 538: assume UTF-8 for Mac OS X tests
ncoghlan Jun 12, 2017
e43b8ef
bpo-28180: Further PEP 538 test case fixes
ncoghlan Jun 13, 2017
0b94b89
Use correct name for test fixture method
ncoghlan Jun 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 24 additions & 5 deletions Lib/test/test_c_locale_coercion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,17 @@
interpreter_requires_environment,
)

# Set our expectation for the default encoding used in the C locale
# for the filesystem encoding and the standard streams
if sys.platform == "darwin":
EXPECTED_C_LOCALE_FSENCODING = "utf-8"
else:
EXPECTED_C_LOCALE_FSENCODING = "ascii"

# XXX (ncoghlan): The above is probably still wrong for:
# * Windows when PYTHONLEGACYWINDOWSFSENCODING is set
# * AIX and any other platforms that use latin-1 in the C locale

# In order to get the warning messages to match up as expected, the candidate
# order here must much the target locale order in Python/pylifecycle.c
_C_UTF8_LOCALES = ("C.UTF-8", "C.utf8", "UTF-8")
Expand Down Expand Up @@ -134,7 +145,7 @@ def test_library_c_locale_warning(self):
}
with self.subTest(forced_locale=locale_to_set):
self._check_child_encoding_details(var_dict,
"ascii",
EXPECTED_C_LOCALE_FSENCODING,
[LIBRARY_C_LOCALE_WARNING])

# Details of the CLI locale coercion warning emitted at runtime
Expand All @@ -158,14 +169,16 @@ def setUpModule():
for target_locale in _C_UTF8_LOCALES:
if _set_locale_in_subprocess(target_locale):
AVAILABLE_TARGETS.append(target_locale)
if not AVAILABLE_TARGETS:
raise unittest.SkipTest("No C-with-UTF-8 locale available")



class _LocaleCoercionTargetsTestCase(_ChildProcessEncodingTestCase):
# Base class for test cases that rely on coercion targets being defined
pass

@classmethod
def setUpClass(cls):
if not AVAILABLE_TARGETS:
raise unittest.SkipTest("No C-with-UTF-8 locale available")


class LocaleConfigurationTests(_LocaleCoercionTargetsTestCase):
Expand All @@ -186,6 +199,11 @@ def test_external_target_locale_configuration(self):
}
for env_var in ("LANG", "LC_CTYPE"):
for locale_to_set in AVAILABLE_TARGETS:
# XXX (ncoghlan): LANG=UTF-8 doesn't appear to work as
# expected, so skip that combination for now
if env_var == "LANG" and locale_to_set == "UTF-8":
continue

with self.subTest(env_var=env_var,
configured_locale=locale_to_set):
var_dict = base_var_dict.copy()
Expand Down Expand Up @@ -251,7 +269,8 @@ def test_PYTHONCOERCECLOCALE_not_zero(self):

def test_PYTHONCOERCECLOCALE_set_to_zero(self):
# The setting "0" should result in the locale coercion being disabled
self._check_c_locale_coercion("ascii", coerce_c_locale="0")
self._check_c_locale_coercion(EXPECTED_C_LOCALE_FSENCODING,
coerce_c_locale="0")


def test_main():
Expand Down