diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2014-11-02 19:26:28 +0200 |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2014-11-02 19:26:28 +0200 |
| commit | bb019eb4c1fc68cb2c83110306d4b4ff80355cd4 (patch) | |
| tree | f17f7f24a5c3c8851a3be51b8e0a703278520989 | |
| parent | c1ded29f8ed57b1ace0eff22c36bccb7b8c34887 (diff) | |
| parent | 6e2db04345b76e6b06ca9c7a604b63ddcaf90cc4 (diff) | |
| download | cpython-git-bb019eb4c1fc68cb2c83110306d4b4ff80355cd4.tar.gz | |
Merge heads
| -rw-r--r-- | Lib/test/test___all__.py | 7 | ||||
| -rw-r--r-- | 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 8cc285f70a..e94d984f2b 100644 --- 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: - locale.setlocale(locale.LC_CTYPE, 'C') + finally: + locale.setlocale(locale.LC_CTYPE, locale_tuple) ignored = [] failed_imports = [] @@ -224,6 +224,7 @@ Per Cederqvist Matej Cepl Carl Cerecke Octavian Cerna +Michael Cetrulo Dave Chambers Pascal Chambon John Chandler |