Merged revisions 74687 via svnmerge from

ronald.oussoren · ronald.oussoren · commit e74dc0ea4fd9 · 2009-09-06T14:01:46.000Z
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r74687 | ronald.oussoren | 2009-09-06 15:59:02 +0200 (Sun, 06 Sep 2009) | 3 lines 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 ........ git-svn-id: http://svn.python.org/projects/python/branches/release31-maint@74688 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git a/Lib/locale.py b/Lib/locale.py
@@ -567,10 +567,22 @@ def getpreferredencoding(do_setlocale = True):
                 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
