diff -r a22ef88143b9 Lib/test/test___all__.py
--- a/Lib/test/test___all__.py	Sat Oct 25 23:05:21 2014 -0500
+++ b/Lib/test/test___all__.py	Tue Oct 28 12:11:52 2014 +0200
@@ -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 = []