[Python-checkins] cpython (merge 3.4 -> default): #22751: merge with 3.4.

[ezio.melotti]

https://hg.python.org/cpython/rev/3c030e4da7c6
changeset:   93350:3c030e4da7c6
parent:      93347:64a54f0c87d7
parent:      93348:37ed6eed0595
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sun Nov 02 19:14:54 2014 +0200
summary:
  #22751: merge with 3.4.

files:
  Lib/test/test___all__.py |  7 ++++---
  Misc/ACKS                |  1 +
  2 files changed, 5 insertions(+), 3 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,13 +72,14 @@
 
         # 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
-            import locale
         except ImportError:
             pass
-        else:
-            locale.setlocale(locale.LC_CTYPE, 'C')
+        finally:
+            locale.setlocale(locale.LC_CTYPE, locale_tuple)
 
         ignored = []
         failed_imports = []
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -224,6 +224,7 @@
 Matej Cepl
 Carl Cerecke
 Octavian Cerna
+Michael Cetrulo
 Dave Chambers
 Pascal Chambon
 John Chandler

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