From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Sun, 6 Sep 2009 13:59:02 +0000 (+0000)
Subject: Fix for issue 6393: Python crashes on OSX when $LANG is set to some (but
X-Git-Tag: v3.2a1~2608
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6d77e07196bfb5dfa4de6f5d80b2619c0643a75e;p=python

Fix for issue 6393: Python crashes on OSX when $LANG is set to some (but
not all) invalid values due to an invalid result from nl_langinfo
---

diff --git a/Lib/locale.py b/Lib/locale.py
index 4ab3c6a48c..b7aaa52f04 100644
--- a/Lib/locale.py
+++ b/Lib/locale.py
@@ -570,10 +570,22 @@ else:
                 except Error:
                     pass
                 result = nl_langinfo(CODESET)
+                if not result and sys.platform == 'darwin':
+                    # nl_langinfo can return an empty string
+                    # when the setting has an invalid value.
+                    # Default to UTF-8 in that case because
+                    # UTF-8 is the default charset on OSX and
+                    # returning nothing will crash the
+                    # interpreter.
+                    result = 'UTF-8'
+
                 setlocale(LC_CTYPE, oldloc)
                 return result
             else:
-                return nl_langinfo(CODESET)
+                result = nl_langinfo(CODESET)
+                if not result and sys.platform == 'darwin':
+                    # See above for explanation
+                    result = 'UTF-8'
 
 
 ### Database