[Python-checkins] cpython (merge 3.4 -> 3.4): Merge heads
serhiy.storchaka
python-checkins at python.org
Sun Nov 2 18:29:27 CET 2014
https://hg.python.org/cpython/rev/a5dd8e89d4da
changeset: 93353:a5dd8e89d4da
branch: 3.4
parent: 93351:e3825486da53
parent: 93348:37ed6eed0595
user: Serhiy Storchaka <storchaka at gmail.com>
date: Sun Nov 02 19:26:23 2014 +0200
summary:
Merge heads
files:
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
--- a/Lib/test/test___all__.py
+++ b/Lib/test/test___all__.py
@@ -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 = []
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -222,6 +222,7 @@
Matej Cepl
Carl Cerecke
Octavian Cerna
+Michael Cetrulo
Dave Chambers
Pascal Chambon
John Chandler
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list