mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-01 04:42:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge heads

Browse source
This commit is contained in:
Serhiy Storchaka 2014-11-02 19:26:23 +02:00
commit 58905e9ba2
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Lib/test/test___all__.py
View file

@ -72,13 +72,14 @@ class AllTest(unittest.TestCase):
# rlcompleter needs special consideration; it import readline which # rlcompleter needs special consideration; it import readline which
# initializes GNU readline which calls setlocale(LC_CTYPE, "")... :-( # initializes GNU readline which calls setlocale(LC_CTYPE, "")... :-(
import locale
locale_tuple = locale.getlocale(locale.LC_CTYPE)
try: try:
import rlcompleter import rlcompleter
import locale
except ImportError: except ImportError:
pass pass
else: finally:
locale.setlocale(locale.LC_CTYPE, 'C') locale.setlocale(locale.LC_CTYPE, locale_tuple)
ignored = [] ignored = []
failed_imports = [] failed_imports = []

1
Misc/ACKS
View file

@ -222,6 +222,7 @@ Per Cederqvist
Matej Cepl Matej Cepl
Carl Cerecke Carl Cerecke
Octavian Cerna Octavian Cerna
Michael Cetrulo
Dave Chambers Dave Chambers
Pascal Chambon Pascal Chambon
John Chandler John Chandler