From f3f231f60cd59e9e1bceccde11a1997054a73113 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Tue, 20 Sep 2005 07:02:49 +0000 Subject: - 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. --- Lib/locale.py | 4 +++- Misc/NEWS | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Lib/locale.py b/Lib/locale.py index bf79952..e4d6023 100644 --- a/Lib/locale.py +++ b/Lib/locale.py @@ -306,7 +306,7 @@ def _build_localename(localetuple): else: 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 them as tuple (language code, encoding). @@ -351,6 +351,8 @@ def getdefaultlocale(envvars=('LANGUAGE', 'LC_ALL', 'LC_CTYPE', 'LANG')): for variable in envvars: localename = lookup(variable,None) if localename: + if variable == 'LANGUAGE': + localename = localename.split(':')[0] break else: localename = 'C' diff --git a/Misc/NEWS b/Misc/NEWS index a3892fb..ce35555 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -224,6 +224,12 @@ Extension Modules 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. - Bug #1290505: Fix clearing the regex cache for time.strptime(). -- cgit v0.12