From 760f596b6a4b5514afe35e521621f484aef35413 Mon Sep 17 00:00:00 2001 From: Nick Coghlan Date: Sun, 19 Feb 2017 10:03:50 +0530 Subject: [3.5] bpo-29571: Use correct locale encoding in test_re (#149) (#154) ``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. --- Lib/test/test_re.py | 2 +- Misc/NEWS | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py index 9acd5ab..407f346 100644 --- a/Lib/test/test_re.py +++ b/Lib/test/test_re.py @@ -1334,7 +1334,7 @@ class ReTests(unittest.TestCase): 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: diff --git a/Misc/NEWS b/Misc/NEWS index fe50135..c750d5c 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -87,6 +87,14 @@ Documentation - Issue #29349: Fix Python 2 syntax in code for building the 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) + What's New in Python 3.5.3? =========================== -- cgit v0.12