[Python-checkins] python/dist/src/Lib/test test_support.py,1.45,1.46

loewis@users.sourceforge.net loewis@users.sourceforge.net
Sat, 09 Nov 2002 11:57:28 -0800


Update of /cvsroot/python/python/dist/src/Lib/test
In directory usw-pr-cvs1:/tmp/cvs-serv21042

Modified Files:
	test_support.py 
Log Message:
Don't try to convert the test filename to Unicode with -U.


Index: test_support.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_support.py,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** test_support.py	9 Nov 2002 05:26:15 -0000	1.45
--- test_support.py	9 Nov 2002 19:57:26 -0000	1.46
***************
*** 93,97 ****
      # 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 os.name=="nt":
              TESTFN_ENCODING="mbcs"
--- 93,102 ----
      # Unicode name only used if TEST_FN_ENCODING exists for the platform.
      if have_unicode:
!         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"