From: Fredrik Lundh <fredrik@pythonware.com>
Date: Sun, 9 Jul 2000 23:16:10 +0000 (+0000)
Subject: - repaired locale.py for non-windows platforms.  the try/except
X-Git-Tag: v2.0b1~946
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0466132ee4c0a96ef6dd936f0b6415991d20e570;p=thirdparty%2FPython%2Fcpython.git

- repaired locale.py for non-windows platforms.  the try/except
  checked for the wrong exception.  my fault.  sorry.
  (first reported by Alex Coventry)
---

diff --git a/Lib/locale.py b/Lib/locale.py
index 47f5c4e0386a..1014dbd915bd 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