#22751: fix test___all__ warning about modified environment in the tests. Patch...

diff --git a/Lib/test/test___all__.py b/Lib/test/test___all__.py
index 789f9fbf24fc5e204a4212e3a7b8ddcf57b37178..be6d79b5f89bee7a01e1a7935c0067d0d8f92172 100644 (file)
--- a/Lib/test/test___all__.py
+++ b/Lib/test/test___all__.py
@@ -75,13 +75,14 @@ class AllTest(unittest.TestCase):
 
         # rlcompleter needs special consideration; it imports 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
index db8ba3690218f3ca7df29c44b054640ff53423ba..b1d6d3f07287befb9d19b6790f18bc1fc6c8aa7b 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -218,6 +218,7 @@ Per Cederqvist
 Matej Cepl
 Carl Cerecke
 Octavian Cerna
+Michael Cetrulo
 Dave Chambers
 Pascal Chambon
 John Chandler