traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- repaired locale.py for non-windows platforms. the try/except 

checked for the wrong exception.  my fault.  sorry.
  (first reported by Alex Coventry)
This commit is contained in:
Fredrik Lundh 2000-07-09 23:16:10 +00:00
parent b78165566e
commit 0466132ee4
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Lib/locale.py
View File

@ -282,16 +282,19 @@ def getdefaultlocale(envvars=('LANGUAGE', 'LC_ALL', 'LC_CTYPE', 'LANG')):
be determined. be determined.
""" """
try: try:
# check if it's supported by the _locale module # check if it's supported by the _locale module
import _locale import _locale
code, encoding = _locale._getdefaultlocale() code, encoding = _locale._getdefaultlocale()
except (ImportError, AttributeError):
pass
else:
if sys.platform == "win32" and code and code[:2] == "0x": if sys.platform == "win32" and code and code[:2] == "0x":
# map windows language identifier to language name # map windows language identifier to language name
code = windows_locale.get(int(code, 0)) code = windows_locale.get(int(code, 0))
return code, encoding return code, encoding
except (ImportError, NameError):
pass
# fall back on POSIX behaviour # fall back on POSIX behaviour
import os import os
lookup = os.environ.get lookup = os.environ.get