[Python-checkins] cpython (3.5): Issue #29273: Remove unneeded workaround to restore locale

martin.panter python-checkins at python.org
Mon Jan 23 23:57:13 EST 2017


https://hg.python.org/cpython/rev/154757703c98
changeset:   106289:154757703c98
branch:      3.5
parent:      106282:c0a9fb3e19b9
user:        Martin Panter <vadmium+py at gmail.com>
date:        Mon Jan 23 22:11:09 2017 +0000
summary:
  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.

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
@@ -70,17 +70,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


More information about the Python-checkins mailing list