From 0c66eb0b9fd6046e05a1dab34eced4673a5931e5 Mon Sep 17 00:00:00 2001
From: Nick Coghlan <ncoghlan@gmail.com>
Date: Sat, 18 Feb 2017 15:01:22 +0530
Subject: [PATCH] [3.6] bpo-29571: Use correct locale encoding in test_re
 (#149)

``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           | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py
index b945cf094e99c1..a506b98be4aeb2 100644
--- a/Lib/test/test_re.py
+++ b/Lib/test/test_re.py
@@ -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:
diff --git a/Misc/NEWS b/Misc/NEWS
index 0fe1f9b9d651bf..f170ffcf6f6a3d 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -200,6 +200,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.