Skip to content

Commit

Permalink
[3.6] bpo-29571: Use correct locale encoding in test_re (#149) (#153)
Browse files Browse the repository at this point in the history
``local.getlocale(locale.LC_CTYPE)`` and
``locale.getpreferredencoding(False)`` may give different answers
in some cases (such as the ``en_IN`` locale).

``re.LOCALE`` uses the latter, so update the test case to match.
  • Loading branch information
ncoghlan authored Feb 19, 2017
1 parent d372cda commit 0683d68
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Lib/test/test_re.py
Original file line number Diff line number Diff line change
Expand Up @@ -1402,7 +1402,7 @@ def test_ascii_and_unicode_flag(self):

def test_locale_flag(self):
import locale
_, enc = locale.getlocale(locale.LC_CTYPE)
enc = locale.getpreferredencoding(False)
# Search non-ASCII letter
for i in range(128, 256):
try:
Expand Down
5 changes: 5 additions & 0 deletions Misc/NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,11 @@ Documentation
Tests
-----

- Issue #29571: to match the behaviour of the ``re.LOCALE`` flag,
test_re.test_locale_flag now uses ``locale.getpreferredencoding(False)`` to
determine the candidate encoding for the test regex (allowing it to correctly
skip the test when the default locale encoding is a multi-byte encoding)

- Issue #28950: Disallow -j0 to be combined with -T/-l in regrtest
command line arguments.

Expand Down

0 comments on commit 0683d68

Please sign in to comment.