Merge heads

serhiy-storchaka · serhiy-storchaka · commit 58905e9ba25f · 2014-11-02T19:26:23.000+02:00
diff --git a/Lib/test/test___all__.py b/Lib/test/test___all__.py
@@ -72,13 +72,14 @@ def test_all(self):
 
         # 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
@@ -222,6 +222,7 @@ Per Cederqvist
 Matej Cepl
 Carl Cerecke
 Octavian Cerna
+Michael Cetrulo
 Dave Chambers
 Pascal Chambon
 John Chandler
