From 009352aefd6f744b018df5a6c0cb077e7f667b5b Mon Sep 17 00:00:00 2001
From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sun, 2 Nov 2014 19:08:35 +0200
Subject: [PATCH] #22751: fix test___all__ warning about modified environment
 in the tests.  Patch by Michael Cetrulo.

---
 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
index 789f9fbf24f..be6d79b5f89 100644
--- 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 db8ba369021..b1d6d3f0728 100644
--- 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