From a9170c7eac4801d39e1fa813688e6826245b2258 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Thu, 12 Aug 2004 13:14:52 +0000 Subject: Patch #808719: Ignore the locale's encoding if it is an empty string. Backported to 2.3. --- Lib/idlelib/IOBinding.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/idlelib/IOBinding.py b/Lib/idlelib/IOBinding.py index 7baf8cc..4d67292 100644 --- a/Lib/idlelib/IOBinding.py +++ b/Lib/idlelib/IOBinding.py @@ -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) -- cgit v0.12