From: Martin v. Löwis <martin@v.loewis.de>
Date: Sat, 9 Nov 2002 19:57:26 +0000 (+0000)
Subject: Don't try to convert the test filename to Unicode with -U.
X-Git-Tag: v2.3c1~3489
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2411a2dd8283279cf8c4f9ffcd830271506ed3d2;p=thirdparty%2FPython%2Fcpython.git

Don't try to convert the test filename to Unicode with -U.
---

diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py
index 2e4c93a74082..075d83b94ae7 100644
--- a/Lib/test/test_support.py
+++ b/Lib/test/test_support.py
@@ -92,7 +92,12 @@ elif os.name != 'riscos':
     TESTFN = '@test'
     # Unicode name only used if TEST_FN_ENCODING exists for the platform.
     if have_unicode:
-        TESTFN_UNICODE=unicode("@test-\xe0\xf2", "latin-1") # 2 latin characters.
+        if isinstance('', unicode):
+            # python -U
+            # XXX perhaps unicode() should accept Unicode strings?
+            TESTFN_UNICODE="@test-\xe0\xf2"
+        else:
+            TESTFN_UNICODE=unicode("@test-\xe0\xf2", "latin-1") # 2 latin characters.
         if os.name=="nt":
             TESTFN_ENCODING="mbcs"
 else: