summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_unicode_file.py
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2009-03-26 20:48:25 (GMT)
committerBenjamin Peterson <benjamin@python.org>2009-03-26 20:48:25 (GMT)
commit888a39b54c4f47ee25d53b157e2c50402627cd0b (patch)
tree67a48f107d83b8451e338f1ea822f2b4c65f6960 /Lib/test/test_unicode_file.py
parent21f6aac633a78271e762d6cd4b709e6a91d0c42a (diff)
downloadcpython-888a39b54c4f47ee25d53b157e2c50402627cd0b.zip
cpython-888a39b54c4f47ee25d53b157e2c50402627cd0b.tar.gz
cpython-888a39b54c4f47ee25d53b157e2c50402627cd0b.tar.bz2
remove test_support.TestSkipped and just use unittest.SkipTest
Diffstat (limited to 'Lib/test/test_unicode_file.py')
-rw-r--r--Lib/test/test_unicode_file.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/Lib/test/test_unicode_file.py b/Lib/test/test_unicode_file.py
index 305f98b..d9a810d 100644
--- a/Lib/test/test_unicode_file.py
+++ b/Lib/test/test_unicode_file.py
@@ -5,14 +5,14 @@ import os, glob, time, shutil
import unicodedata
import unittest
-from test.test_support import run_unittest, TestSkipped, TESTFN_UNICODE
+from test.test_support import run_unittest, SkipTest, TESTFN_UNICODE
from test.test_support import TESTFN_ENCODING, TESTFN_UNICODE_UNENCODEABLE
try:
TESTFN_ENCODED = TESTFN_UNICODE.encode(TESTFN_ENCODING)
except (UnicodeError, TypeError):
# Either the file system encoding is None, or the file name
# cannot be encoded in the file system encoding.
- raise TestSkipped("No Unicode filesystem semantics on this platform.")
+ raise SkipTest("No Unicode filesystem semantics on this platform.")
if TESTFN_ENCODED.decode(TESTFN_ENCODING) != TESTFN_UNICODE:
# The file system encoding does not support Latin-1
@@ -26,10 +26,10 @@ if TESTFN_ENCODED.decode(TESTFN_ENCODING) != TESTFN_UNICODE:
# MBCS will not report the error properly
raise UnicodeError, "mbcs encoding problem"
except (UnicodeError, TypeError):
- raise TestSkipped("Cannot find a suiteable filename.")
+ raise SkipTest("Cannot find a suiteable filename.")
if TESTFN_ENCODED.decode(TESTFN_ENCODING) != TESTFN_UNICODE:
- raise TestSkipped("Cannot find a suitable filename.")
+ raise SkipTest("Cannot find a suitable filename.")
def remove_if_exists(filename):
if os.path.exists(filename):