#22751: merge with 3.4.

6e2db043 · Ezio Melotti · 740e1dcd · 8b23f5cc · 6e2db043 · 6e2db043
Commit 6e2db043 authored Nov 02, 2014 by Ezio Melotti
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

Lib/test/test___all__.py Lib/test/test___all__.py +4 -3

Misc/ACKS Misc/ACKS +1 -0

No files found.
--- a/Lib/test/test___all__.py
+++ b/Lib/test/test___all__.py
@@ -72,13 +72,14 @@ class AllTest(unittest.TestCase):
        # 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:
+        finally:
-            locale.setlocale(locale.LC_CTYPE, 'C')
+            locale.setlocale(locale.LC_CTYPE, locale_tuple)
        ignored = []
        failed_imports = []

--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -224,6 +224,7 @@ Per Cederqvist
 Matej Cepl
 Carl Cerecke
 Octavian Cerna
+Michael Cetrulo
 Dave Chambers
 Pascal Chambon
 John Chandler