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 777bb03f4fba0203cd710aa87c4cde89743eea84..f44effe6d270ccfcf80d0c8e69d0c989fbb426ec 100644 (file)
--- a/Lib/locale.py
+++ b/Lib/locale.py
@@ -553,7 +553,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