diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2010-09-10 11:24:10 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2010-09-10 11:24:10 (GMT) |
| commit | cc676a0d7f683888e658925e2b622e4b88e35605 (patch) | |
| tree | aad572987e3056bb13884550852a4de1fea8d597 /Lib/test/test_unicode_file.py | |
| parent | ffd2a4215a0bfe82f48ff71381bbfce8552f5f0c (diff) | |
| download | cpython-cc676a0d7f683888e658925e2b622e4b88e35605.zip cpython-cc676a0d7f683888e658925e2b622e4b88e35605.tar.gz cpython-cc676a0d7f683888e658925e2b622e4b88e35605.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/test_unicode_file.py')
| -rw-r--r-- | Lib/test/test_unicode_file.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Lib/test/test_unicode_file.py b/Lib/test/test_unicode_file.py index dcd4a36..f04bad3 100644 --- a/Lib/test/test_unicode_file.py +++ b/Lib/test/test_unicode_file.py @@ -6,7 +6,7 @@ import unicodedata import unittest from test.test_support import run_unittest, TESTFN_UNICODE -from test.test_support import TESTFN_ENCODING, TESTFN_UNICODE_UNENCODEABLE +from test.test_support import TESTFN_ENCODING, TESTFN_UNENCODABLE try: TESTFN_ENCODED = TESTFN_UNICODE.encode(TESTFN_ENCODING) except (UnicodeError, TypeError): @@ -171,8 +171,8 @@ class TestUnicodeFiles(unittest.TestCase): def test_single_files(self): self._test_single(TESTFN_ENCODED) self._test_single(TESTFN_UNICODE) - if TESTFN_UNICODE_UNENCODEABLE is not None: - self._test_single(TESTFN_UNICODE_UNENCODEABLE) + if TESTFN_UNENCODABLE is not None: + self._test_single(TESTFN_UNENCODABLE) def test_equivalent_files(self): self._test_equivalent(TESTFN_ENCODED, TESTFN_UNICODE) @@ -188,9 +188,9 @@ class TestUnicodeFiles(unittest.TestCase): self._do_directory(TESTFN_UNICODE+ext, TESTFN_ENCODED+ext, False) self._do_directory(TESTFN_UNICODE+ext, TESTFN_UNICODE+ext, False) # Our directory name that can't use a non-unicode name. - if TESTFN_UNICODE_UNENCODEABLE is not None: - self._do_directory(TESTFN_UNICODE_UNENCODEABLE+ext, - TESTFN_UNICODE_UNENCODEABLE+ext, + if TESTFN_UNENCODABLE is not None: + self._do_directory(TESTFN_UNENCODABLE+ext, + TESTFN_UNENCODABLE+ext, False) def test_main(): |