Patch #808719: Ignore the locale's encoding if it is an empty string.

Backported to 2.3.
This commit is contained in:
Martin v. Löwis 2004-08-12 13:14:52 +00:00
parent 68ba9a685d
commit a9170c7eac
1 changed files with 2 additions and 2 deletions

View File

@ -48,7 +48,7 @@ else:
# resulting codeset may be unknown to Python. We ignore all
# these problems, falling back to ASCII
encoding = locale.nl_langinfo(locale.CODESET)
if encoding is None:
if encoding is None or encoding is '':
# situation occurs on Mac OS X
encoding = 'ascii'
codecs.lookup(encoding)
@ -58,7 +58,7 @@ else:
# bugs that can cause ValueError.
try:
encoding = locale.getdefaultlocale()[1]
if encoding is None:
if encoding is None or encoding is '':
# situation occurs on Mac OS X
encoding = 'ascii'
codecs.lookup(encoding)