Don't try to use a bytes sequence for file paths. Also force equivalency tests

to be between str8 and str.

diff --git a/Lib/test/test_unicode_file.py b/Lib/test/test_unicode_file.py
index 9cf48df816d096233f63c6b8a7e5bb14b910fe95..69d99aa0d8e1b98e46d7106daa17bce48f5a35f9 100644 (file)
--- a/Lib/test/test_unicode_file.py
+++ b/Lib/test/test_unicode_file.py
@@ -8,7 +8,8 @@ import unittest
 from test.test_support import run_unittest, TestSkipped, TESTFN_UNICODE
 from test.test_support import TESTFN_ENCODING, TESTFN_UNICODE_UNENCODEABLE
 try:
-    TESTFN_ENCODED = TESTFN_UNICODE.encode(TESTFN_ENCODING)
+    TESTFN_ENCODED = TESTFN_UNICODE
+    TESTFN_UNICODE.encode(TESTFN_ENCODING)
 except (UnicodeError, TypeError):
     # Either the file system encoding is None, or the file name
     # cannot be encoded in the file system encoding.
@@ -76,6 +77,7 @@ class TestUnicodeFiles(unittest.TestCase):
     # Do as many "equivalancy' tests as we can - ie, check that although we
     # have different types for the filename, they refer to the same file.
     def _do_equivilent(self, filename1, filename2):
+        filename2 = str8(filename2)
         # Note we only check "filename1 against filename2" - we don't bother
         # checking "filename2 against 1", as we assume we are called again with
         # the args reversed.