[Python-checkins] cpython (merge 3.5 -> 3.6): Issues #29273: Merge test___all__ from 3.5

[martin.panter]

https://hg.python.org/cpython/rev/146f7ec82f93
changeset:   106290:146f7ec82f93
branch:      3.6
parent:      106286:ffb2534fcbf1
parent:      106289:154757703c98
user:        Martin Panter <vadmium+py at gmail.com>
date:        Mon Jan 23 22:59:03 2017 +0000
summary:
  Issues #29273: Merge test___all__ from 3.5

files:
  Lib/test/test___all__.py |  11 -----------
  1 files changed, 0 insertions(+), 11 deletions(-)


diff --git a/Lib/test/test___all__.py b/Lib/test/test___all__.py
--- 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__))

-- 
Repository URL: https://hg.python.org/cpython