diff options
author | Victor Stinner <victor.stinner@haypocalc.com> | 2010-09-10 12:32:58 (GMT) |
---|---|---|
committer | Victor Stinner <victor.stinner@haypocalc.com> | 2010-09-10 12:32:58 (GMT) |
commit | 0ea31a93551d352fe989d8bc2728046abc4fc6c4 (patch) | |
tree | 29bc6653ca51b47837e23df1189562decea5d9cd /Lib/test/support.py | |
parent | 0d823ed434b594b52a9fdf02fb862bd960c7c5c3 (diff) | |
download | cpython-0ea31a93551d352fe989d8bc2728046abc4fc6c4.zip cpython-0ea31a93551d352fe989d8bc2728046abc4fc6c4.tar.gz cpython-0ea31a93551d352fe989d8bc2728046abc4fc6c4.tar.bz2 |
Recorded merge of revisions 83987 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r83987 | victor.stinner | 2010-08-14 00:23:24 +0200 (sam., 14 août 2010) | 2 lines
Fix a typo: TESTFN_UNENCODEABLE => TESTFN_UNENCODABLE
........
Diffstat (limited to 'Lib/test/support.py')
-rw-r--r-- | Lib/test/support.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Lib/test/support.py b/Lib/test/support.py index 6096c18..34005e8 100644 --- a/Lib/test/support.py +++ b/Lib/test/support.py @@ -343,13 +343,13 @@ else: # file system encoding, but *not* with the default (ascii) encoding TESTFN_UNICODE = "@test-\xe0\xf2" TESTFN_ENCODING = sys.getfilesystemencoding() - # TESTFN_UNICODE_UNENCODEABLE is a filename that should *not* be + # TESTFN_UNENCODABLE 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 + TESTFN_UNENCODABLE = None else: # Different kinds of characters from various languages to minimize the # probability that the whole name is encodable to MBCS (issue #9819) @@ -360,13 +360,13 @@ else: # errors=ignore' mode - hence we get '?' characters rather than # the exception. 'Latin1' operates as we expect - ie, fails. # See [ 850997 ] mbcs encoding ignores errors - TESTFN_UNICODE_UNENCODEABLE.encode("Latin1") + TESTFN_UNENCODABLE.encode("Latin1") except UnicodeEncodeError: pass else: print('WARNING: The filename %r CAN be encoded by the filesystem. ' 'Unicode filename tests may not be effective' - % TESTFN_UNICODE_UNENCODEABLE) + % TESTFN_UNENCODABLE) if os.path.isdir(TESTFN): # a test failed (eg. test_os) without removing TESTFN directory |