diff --git a/Lib/locale.py b/Lib/locale.py index f6d174c8599..54d4c0e2e9e 100644 --- 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