diff options
| author | Benjamin Peterson <benjamin@python.org> | 2009-03-26 20:48:25 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2009-03-26 20:48:25 (GMT) |
| commit | 888a39b54c4f47ee25d53b157e2c50402627cd0b (patch) | |
| tree | 67a48f107d83b8451e338f1ea822f2b4c65f6960 /Lib/test/test_locale.py | |
| parent | 21f6aac633a78271e762d6cd4b709e6a91d0c42a (diff) | |
| download | cpython-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_locale.py')
| -rw-r--r-- | Lib/test/test_locale.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Lib/test/test_locale.py b/Lib/test/test_locale.py index 2612c79..84865f6 100644 --- a/Lib/test/test_locale.py +++ b/Lib/test/test_locale.py @@ -1,4 +1,4 @@ -from test.test_support import run_unittest, verbose, TestSkipped +from test.test_support import run_unittest, verbose, SkipTest import unittest import locale import sys @@ -10,7 +10,7 @@ enUS_locale = None def get_enUS_locale(): global enUS_locale if sys.platform == 'darwin': - raise TestSkipped("Locale support on MacOSX is minimal") + raise SkipTest("Locale support on MacOSX is minimal") if sys.platform.startswith("win"): tlocs = ("En", "English") else: @@ -23,7 +23,7 @@ def get_enUS_locale(): continue break else: - raise TestSkipped( + raise SkipTest( "Test locale not supported (tried %s)" % (', '.join(tlocs))) enUS_locale = tloc locale.setlocale(locale.LC_NUMERIC, oldlocale) @@ -355,10 +355,10 @@ def test_main(): TestCNumberFormatting, TestFrFRNumberFormatting, ] - # TestSkipped can't be raised inside unittests, handle it manually instead + # SkipTest can't be raised inside unittests, handle it manually instead try: get_enUS_locale() - except TestSkipped as e: + except SkipTest as e: if verbose: print "Some tests will be disabled: %s" % e else: |