From: Neal Norwitz <nnorwitz@gmail.com>
Date: Sun, 26 Mar 2006 03:11:57 +0000 (+0000)
Subject: Try to handle sys.getfilesystemencoding() returning None.
X-Git-Tag: v2.5a0~91
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2c85d826d8b95bb3e1141b5084bd0a575803d664;p=python

Try to handle sys.getfilesystemencoding() returning None.
ascii seems like the safest bet that it will exist.  I wonder if utf-8
would be a better choice?  This should get test_fileinput passing on OpenBSD.
---

diff --git a/Lib/test/test_fileinput.py b/Lib/test/test_fileinput.py
index f3a7841990..301769e4f5 100644
--- a/Lib/test/test_fileinput.py
+++ b/Lib/test/test_fileinput.py
@@ -162,7 +162,10 @@ if verbose:
     print "15. Unicode filenames"
 try:
     t1 = writeTmp(1, ["A\nB"])
-    fi = FileInput(files=unicode(t1, sys.getfilesystemencoding()))
+    encoding = sys.getfilesystemencoding()
+    if encoding is None:
+        encoding = 'ascii'
+    fi = FileInput(files=unicode(t1, encoding))
     lines = list(fi)
     verify(lines == ["A\n", "B"])
 finally: