Merged revisions 72375 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72375 | jeroen.ruigrok | 2009-05-06 07:25:42 +0200 (wo, 06 mei 2009) | 5 lines

  Wrap getpreferredencoding()'s use of setlocale in a try/except to prevent
  us from raising an exception when the locale is invalid.

  Issue #1443504
........

diff --git a/Lib/locale.py b/Lib/locale.py
index 372c955d0ef616d5d1c45b6e46f8e326d69dfc5f..75a6435430fd8d12caff8865a3ba6d4f7c85e8e1 100644 (file)
--- a/Lib/locale.py
+++ b/Lib/locale.py
@@ -564,7 +564,10 @@ else:
             according to the system configuration."""
             if do_setlocale:
                 oldloc = setlocale(LC_CTYPE)
-                setlocale(LC_CTYPE, "")
+                try:
+                    setlocale(LC_CTYPE, "")
+                except:
+                    pass
                 result = nl_langinfo(CODESET)
                 setlocale(LC_CTYPE, oldloc)
                 return result