From: Jeroen Ruigrok van der Werven <asmodai@in-nomine.org>
Date: Wed, 6 May 2009 08:25:53 +0000 (+0000)
Subject: Merged revisions 72376 via svnmerge from
X-Git-Tag: 3.0~122
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4793ebb2b3e3275c120d4f43c8c08aa3bb15a187;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 72376 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r72376 | jeroen.ruigrok | 2009-05-06 07:33:24 +0200 (wo, 06 mei 2009) | 12 lines

  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 17056b9df216..7d06b06614b5 100644
--- a/Lib/locale.py
+++ b/Lib/locale.py
@@ -557,7 +557,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