From: Martin Panter <vadmium+py@gmail.com>
Date: Mon, 23 Jan 2017 22:11:09 +0000 (+0000)
Subject: Issue #29273: Remove unneeded workaround to restore locale
X-Git-Tag: v3.6.1rc1~144^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b1b985da12465a4c5488c7543ffb743f49d3650f;p=thirdparty%2FPython%2Fcpython.git

Issue #29273: Remove unneeded workaround to restore locale

The “readline” module already has a workaround using setlocale(LC_CTYPE,
NULL). The code in test___all__ calls getlocale(), which can subtly alter
the locale string and cause the test framework to complain.
---

diff --git a/Lib/test/test___all__.py b/Lib/test/test___all__.py
index e94d984f2b94..2fc5e3e3746d 100644
--- a/Lib/test/test___all__.py
+++ b/Lib/test/test___all__.py
@@ -70,17 +70,6 @@ class AllTest(unittest.TestCase):
             # than an AttributeError somewhere deep in CGIHTTPServer.
             import _socket
 
-        # rlcompleter needs special consideration; it import readline which
-        # initializes GNU readline which calls setlocale(LC_CTYPE, "")... :-(
-        import locale
-        locale_tuple = locale.getlocale(locale.LC_CTYPE)
-        try:
-            import rlcompleter
-        except ImportError:
-            pass
-        finally:
-            locale.setlocale(locale.LC_CTYPE, locale_tuple)
-
         ignored = []
         failed_imports = []
         lib_dir = os.path.dirname(os.path.dirname(__file__))