#22751: fix test___all__ warning about modified environment in the tests. Patch by Michael Cetrulo.
diff --git a/Lib/test/test___all__.py b/Lib/test/test___all__.py
index 789f9fb..be6d79b 100644
--- a/Lib/test/test___all__.py
+++ b/Lib/test/test___all__.py
@@ -75,13 +75,14 @@
# 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 db8ba36..b1d6d3f 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -218,6 +218,7 @@
Matej Cepl
Carl Cerecke
Octavian Cerna
+Michael Cetrulo
Dave Chambers
Pascal Chambon
John Chandler