commit 041f465cbd0d180426cbd5ab544266b7c06fd120
author Jeroen Ruigrok van der Werven <asmodai@in-nomine.org> Wed May 06 05:25:42 2009 +0000
committer Jeroen Ruigrok van der Werven <asmodai@in-nomine.org> Wed May 06 05:25:42 2009 +0000
tree ace47e98347e3b88962cb57122541aece190b520
parent eaeb4c695e5b493dcf66d381ff21a659d9388d62

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

Issue #1443504

Lib/locale.py

diff --git a/Lib/locale.py b/Lib/locale.py
index 777bb03..f44effe 100644
--- a/Lib/locale.py
+++ b/Lib/locale.py
@@ -553,7 +553,10 @@
             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