From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 8 Mar 2017 07:56:59 +0000 (-0800)
Subject: Revert "bpo-29571: Use correct locale encoding in test_re (#149)" (#554) (#555)
X-Git-Tag: v3.6.2rc1~346
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6a4b04cd337347d074ae0140fb13dca5bd4b11ef;p=python

Revert "bpo-29571: Use correct locale encoding in test_re (#149)" (#554) (#555)

This reverts commit ace5c0fdd9b962e6e886c29dbcea72c53f051dc4.
---

diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py
index a506b98be4..b945cf094e 100644
--- a/Lib/test/test_re.py
+++ b/Lib/test/test_re.py
@@ -1402,7 +1402,7 @@ class ReTests(unittest.TestCase):
 
     def test_locale_flag(self):
         import locale
-        enc = locale.getpreferredencoding(False)
+        _, enc = locale.getlocale(locale.LC_CTYPE)
         # Search non-ASCII letter
         for i in range(128, 256):
             try:
diff --git a/Misc/NEWS b/Misc/NEWS
index 7a03a2d65e..bf3876948f 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -134,6 +134,7 @@ Library
 
 - bpo-29110: Fix file object leak in aifc.open() when file is given as a
   filesystem path and is not in valid AIFF format. Patch by Anthony Zhang.
+- Issue #24932: Use proper command line parsing in _testembed
 
 - Issue #28556: Various updates to typing module: typing.Counter, typing.ChainMap,
   improved ABC caching, etc. Original PRs by Jelle Zijlstra, Ivan Levkivskyi,