Skip to content

bpo-30647: Check nl_langinfo(CODESET) in locale coercion #2374

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 6 commits into from
Jun 29, 2017
Merged

bpo-30647: Check nl_langinfo(CODESET) in locale coercion #2374

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f051cc5
bpo-30647: Check nl_langinfo(CODESET) in locale coercion
ncoghlan Jun 24, 2017
64a708c
Attempt to fix skip condition in tests
ncoghlan Jun 24, 2017
5f262ef
Conditionally check nl_langinfo in locale coercion tests
ncoghlan Jun 24, 2017
f5fe874
Skip the nl_langinfo check on OS X
ncoghlan Jun 25, 2017
598c21e
Avoid unused variable warning
ncoghlan Jun 25, 2017
631fd5a
Set locale from environment if nl_langinfo fails
ncoghlan Jun 29, 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
Prev Previous commit
Next Next commit
Conditionally check nl_langinfo in locale coercion tests 
The problem with dynamically adaptive tests is that they
can sometimes pass without actually testing anything useful.

On Linux and Mac OS X, if setlocale works, we also expect
nl_langinfo(CODESET) to *always* work for the coercion target
locales. The tests now reflect this by always assuming the
target locale will work if setlocale succeeds when running
on Linux or Mac OS X.
  • Loading branch information
@ncoghlan
ncoghlan committed Jun 24, 2017
commit 5f262ef550ea9a5860dc92d232fd4a307f059f54
13 changes: 11 additions & 2 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 @@ -40,18 +40,27 @@
# is to try them with locale.setlocale(). We do that in a subprocess
# to avoid altering the locale of the test runner.
#
# If the relevant locale module attributes exist, we also check that
# If the relevant locale module attributes exist, and we're not on a platform
# where we expect it to always succeed, we also check that
# `locale.nl_langinfo(locale.CODESET)` works, as if it fails, the interpreter
# will skip locale coercion for that particular target locale
_check_nl_langinfo_CODESET = bool(
sys.platform not in ("darwin", "linux") and
hasattr(locale, "nl_langinfo") and
hasattr(locale, "CODESET")
)

def _set_locale_in_subprocess(locale_name):
cmd_fmt = "import locale; print(locale.setlocale(locale.LC_CTYPE, '{}'))"
if hasattr(locale, "nl_langinfo") and hasattr(locale, "CODESET"):
if _check_nl_langinfo_CODESET:
# If there's no valid CODESET, we expect coercion to be skipped
cmd_fmt += "; import sys; sys.exit(not locale.nl_langinfo(locale.CODESET))"
cmd = cmd_fmt.format(locale_name)
result, py_cmd = run_python_until_end("-c", cmd, __isolated=True)
return result.rc == 0



_fields = "fsencoding stdin_info stdout_info stderr_info lang lc_ctype lc_all"
_EncodingDetails = namedtuple("EncodingDetails", _fields)

Expand Down