diff options
-rw-r--r-- | Lib/test/test_support.py | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py index 9fcc049..6a0b0d8 100644 --- a/Lib/test/test_support.py +++ b/Lib/test/test_support.py @@ -130,23 +130,24 @@ else: if isinstance('', unicode): # python -U # XXX perhaps unicode() should accept Unicode strings? - TESTFN_UNICODE="@test-\xe0\xf2" + 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 + # 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 + # 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 + 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) TESTFN_UNICODE_UNENCODEABLE = u"@test-\u5171\u6709\u3055\u308c\u308b" try: # XXX - Note - should be using TESTFN_ENCODING here - but for - # Windows, "mbcs" currently always operates as if in + # 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. # See [ 850997 ] mbcs encoding ignores errors |