[Python-checkins] python/dist/src/Lib/test test_support.py, 1.60, 1.61

tim_one at users.sourceforge.net tim_one at users.sourceforge.net
Thu Dec 4 00:39:46 EST 2003


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

Modified Files:
	test_support.py 
Log Message:
Typo repair; added some comments and horizontal whitespace.


Index: test_support.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_support.py,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** test_support.py	3 Dec 2003 22:16:46 -0000	1.60
--- test_support.py	4 Dec 2003 05:39:43 -0000	1.61
***************
*** 131,145 ****
              # 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.
!         TESTFN_ENCODING=sys.getfilesystemencoding()
!         # TESTFN_UNICODE_UNENCODEABLE is a filename that should *not* be 
          # able to be encoded by *either* the default or filesystem encoding.
!         # This test really only makes sense on Windows NT platforms 
          # which have special Unicode support in posixmodule.
!         if not hasattr(sys, "getwindowsversion") or \
!            sys.getwindowsversion()[3]<2:
!            TESTFN_UNICODE_UNENCODABLE = None
          else:
              # Japanese characters (I think - from bug 846133)
--- 131,146 ----
              # python -U
              # XXX perhaps unicode() should accept Unicode strings?
!             TESTFN_UNICODE = "@test-\xe0\xf2"
          else:
!             # 2 latin characters.
!             TESTFN_UNICODE = unicode("@test-\xe0\xf2", "latin-1")
!         TESTFN_ENCODING = sys.getfilesystemencoding()
!         # TESTFN_UNICODE_UNENCODEABLE is a filename that should *not* be
          # able to be encoded by *either* the default or filesystem encoding.
!         # This test really only makes sense on Windows NT platforms
          # which have special Unicode support in posixmodule.
!         if (not hasattr(sys, "getwindowsversion") or
!                 sys.getwindowsversion()[3] < 2): #  0=win32s or 1=9x/ME
!            TESTFN_UNICODE_UNENCODEABLE = None
          else:
              # Japanese characters (I think - from bug 846133)
***************
*** 147,151 ****
              try:
                  # XXX - Note - should be using TESTFN_ENCODING here - but for
!                 # Windows, "mbcs" currently always operates as if in 
                  # errors=ignore' mode - hence we get '?' characters rather than
                  # the exception.  'Latin1' operates as we expect - ie, fails.
--- 148,152 ----
              try:
                  # XXX - Note - should be using TESTFN_ENCODING here - but for
!                 # Windows, "mbcs" currently always operates as if in
                  # errors=ignore' mode - hence we get '?' characters rather than
                  # the exception.  'Latin1' operates as we expect - ie, fails.





More information about the Python-checkins mailing list