diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2014-11-02 19:26:23 +0200 |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2014-11-02 19:26:23 +0200 |
| commit | 58905e9ba25f36e12b9db19cd8b2a58b50f04ffe (patch) | |
| tree | 226f3d05c733c21ebf1d44a4329f05d8bb15c4cd /Lib/test | |
| parent | e5cf4868d38d81e8d72e45f78e357f7d3372851a (diff) | |
| parent | 8b23f5cc7acd815a3c1d7d36143e6b3bf6347a18 (diff) | |
| download | cpython-git-58905e9ba25f36e12b9db19cd8b2a58b50f04ffe.tar.gz | |
Merge heads
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | Lib/test/test___all__.py | 7 |
1 files changed, 4 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 = [] |