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 163b0440e65f7431ea9aa720fb2dad5c98399f87..1536bb594b80e1c1ec8241fc6d39d8ecc962b917 100644 (file)
--- a/Lib/locale.py
+++ b/Lib/locale.py
@@ -546,7 +546,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