From: Tony Lownds <tony@lownds.com>
Date: Mon, 23 Sep 2002 01:01:20 +0000 (+0000)
Subject: Work around Mac OS X platform encoding issues.
X-Git-Tag: v2.3c1~4009
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e555fc76a762a830ed067993fd6073bc69da123f;p=thirdparty%2FPython%2Fcpython.git

Work around Mac OS X platform encoding issues.
---

diff --git a/Lib/idlelib/IOBinding.py b/Lib/idlelib/IOBinding.py
index 58d1913c7e81..10129e9b71fb 100644
--- a/Lib/idlelib/IOBinding.py
+++ b/Lib/idlelib/IOBinding.py
@@ -65,6 +65,9 @@ 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:
+            # situation occurs on Mac OS X
+            encoding = 'ascii'
         codecs.lookup(encoding)
     except (NameError, AttributeError, LookupError):
         # Try getdefaultlocale well: it parses environment variables,
@@ -72,6 +75,9 @@ else:
         # bugs that can cause ValueError.
         try:
             encoding = locale.getdefaultlocale()[1]
+            if encoding is None:
+                # situation occurs on Mac OS X
+                encoding = 'ascii'
             codecs.lookup(encoding)
         except (ValueError, LookupError):
             pass