- 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 47f5c4e0386a9e1b38a6c0340d6243e5b70fa9f3..1014dbd915bd930198b3f91bd76638a8282aad01 100644 (file)
--- 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