--- Lib/locale.py~ 2004-07-26 14:45:59.000000000 +0200 +++ Lib/locale.py 2005-03-20 13:43:56.593415041 +0100 @@ -295,7 +295,7 @@ 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). @@ -340,6 +340,8 @@ for variable in envvars: localename = lookup(variable,None) if localename: + if variable == 'LANGUAGE': + localename = localename.split(':')[0] break else: localename = 'C' @@ -463,9 +465,9 @@ 'ajec': 'eucJP', 'eucjp': 'eucJP', 'ujis': 'eucJP', - 'utf-8': 'utf', - 'utf8': 'utf', - 'utf8@ucs4': 'utf', + 'utf': 'utf-8', + 'utf8': 'utf-8', + 'utf8@ucs4': 'utf-8', } #