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

- Patch #1166948: locale.py: Prefer LC_ALL, LC_CTYPE and LANG over LANGUAGE 

to get the correct encoding.

- Patch #1166938: locale.py: Parse LANGUAGE as a colon separated list of
  languages.
This commit is contained in:
Matthias Klose 2005-09-20 07:02:49 +00:00
parent ba3e6ec0c9
commit f3f231f60c
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/locale.py
View File

@ -306,7 +306,7 @@ def _build_localename(localetuple):
else: else:
return language + '.' + encoding return language + '.' + encoding
def getdefaultlocale(envvars=('LANGUAGE', 'LC_ALL', 'LC_CTYPE', 'LANG')): def getdefaultlocale(envvars=('LC_ALL', 'LC_CTYPE', 'LANG', 'LANGUAGE')):
""" Tries to determine the default locale settings and returns """ Tries to determine the default locale settings and returns
them as tuple (language code, encoding). them as tuple (language code, encoding).
@ -351,6 +351,8 @@ def getdefaultlocale(envvars=('LANGUAGE', 'LC_ALL', 'LC_CTYPE', 'LANG')):
for variable in envvars: for variable in envvars:
localename = lookup(variable,None) localename = lookup(variable,None)
if localename: if localename:
if variable == 'LANGUAGE':
localename = localename.split(':')[0]
break break
else: else:
localename = 'C' localename = 'C'

6
Misc/NEWS
View File

@ -224,6 +224,12 @@ Extension Modules
Library Library
------- -------
- Patch #1166948: locale.py: Prefer LC_ALL, LC_CTYPE and LANG over LANGUAGE
to get the correct encoding.
- Patch #1166938: locale.py: Parse LANGUAGE as a colon separated list of
languages.
- Patch #1268314: Cache lines in StreamReader.readlines for performance. - Patch #1268314: Cache lines in StreamReader.readlines for performance.
- Bug #1290505: Fix clearing the regex cache for time.strptime(). - Bug #1290505: Fix clearing the regex cache for time.strptime().