From 0466132ee4c0a96ef6dd936f0b6415991d20e570 Mon Sep 17 00:00:00 2001 From: Fredrik Lundh Date: Sun, 9 Jul 2000 23:16:10 +0000 Subject: [PATCH] - repaired locale.py for non-windows platforms. the try/except checked for the wrong exception. my fault. sorry. (first reported by Alex Coventry) --- Lib/locale.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Lib/locale.py b/Lib/locale.py index 47f5c4e038..1014dbd915 100644 --- a/Lib/locale.py +++ b/Lib/locale.py @@ -282,16 +282,19 @@ def getdefaultlocale(envvars=('LANGUAGE', 'LC_ALL', 'LC_CTYPE', 'LANG')): be determined. """ + try: # check if it's supported by the _locale module import _locale code, encoding = _locale._getdefaultlocale() + except (ImportError, AttributeError): + pass + else: if sys.platform == "win32" and code and code[:2] == "0x": # map windows language identifier to language name code = windows_locale.get(int(code, 0)) return code, encoding - except (ImportError, NameError): - pass + # fall back on POSIX behaviour import os lookup = os.environ.get -- 2.49.0