commit 9cf20a664cf17becca3e2e6ef25df90508f3b308
author Martin Panter <vadmium+py@gmail.com> Mon Jan 23 22:59:03 2017 +0000
committer Martin Panter <vadmium+py@gmail.com> Mon Jan 23 22:59:03 2017 +0000
tree 51fade99339c242f2657c5422e476d07a43710d0
parent 01f5ae7b76236a19c670d107b06b68ccb69f532f
parent b1b985da12465a4c5488c7543ffb743f49d3650f

Issues #29273: Merge test___all__ from 3.5

Lib/test/test___all__.py

diff --git a/Lib/test/test___all__.py b/Lib/test/test___all__.py
index ae9114e..f6e82eb 100644
--- a/Lib/test/test___all__.py
+++ b/Lib/test/test___all__.py
@@ -72,17 +72,6 @@
             # 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__))