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/test_unicode_file.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/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 367715a..59ab85e 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.support import run_unittest, TESTFN_UNICODE, rmtree -from test.support import TESTFN_ENCODING, TESTFN_UNICODE_UNENCODEABLE +from test.support import TESTFN_ENCODING, TESTFN_UNENCODABLE try: TESTFN_UNICODE.encode(TESTFN_ENCODING) except (UnicodeError, TypeError): @@ -146,8 +146,8 @@ class TestUnicodeFiles(unittest.TestCase): # _test functions with each of the filename combinations we wish to test def test_single_files(self): 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_directories(self): # For all 'equivalent' combinations: @@ -156,9 +156,9 @@ class TestUnicodeFiles(unittest.TestCase): ext = ".dir" 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(): |