Skip to content

[2.7] bpo-6393: Fix locale.getprerredencoding() on macOS #1555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vstinner merged 1 commit into from
May 12, 2017
Merged

[2.7] bpo-6393: Fix locale.getprerredencoding() on macOS #1555

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion Lib/locale.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,10 +617,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
Expand Down