From: Brett Cannon <bcannon@gmail.com>
Date: Mon, 30 Jul 2007 01:34:07 +0000 (+0000)
Subject: Don't try to use a bytes sequence for file paths.  Also force equivalency tests
X-Git-Tag: v3.0a1~559
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=96d7e8369c9ac4e18be002fb4af1400b4a0ca9dd;p=thirdparty%2FPython%2Fcpython.git

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 9cf48df816d0..69d99aa0d8e1 100644
--- 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.