summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorHirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>2010-09-23 15:20:15 (GMT)
committerHirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>2010-09-23 15:20:15 (GMT)
commitb3b390d7b39563d03e9ad28e348a04c705c3db9d (patch)
treecedd061feac01b8fc05e5b875b2834cfb4c0b3c8 /Lib
parent5a7a52fbb0d8097e0e0e5dcf9227b273ee499c66 (diff)
downloadcpython-b3b390d7b39563d03e9ad28e348a04c705c3db9d.zip
cpython-b3b390d7b39563d03e9ad28e348a04c705c3db9d.tar.gz
cpython-b3b390d7b39563d03e9ad28e348a04c705c3db9d.tar.bz2
Issue #9868: locale was left changed after TestEnUSCollation#setUp raised
TestSkip exception.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_locale.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_locale.py b/Lib/test/test_locale.py
index 6cdb67b..e959343 100644
--- a/Lib/test/test_locale.py
+++ b/Lib/test/test_locale.py
@@ -352,13 +352,13 @@ class TestEnUSCollation(BaseLocalizedTest, TestCollation):
locale_type = locale.LC_ALL
def setUp(self):
- BaseLocalizedTest.setUp(self)
enc = codecs.lookup(locale.getpreferredencoding(False) or 'ascii').name
if enc not in ('utf-8', 'iso8859-1', 'cp1252'):
raise unittest.SkipTest('encoding not suitable')
if enc != 'iso8859-1' and (sys.platform == 'darwin' or
sys.platform.startswith('freebsd')):
raise unittest.SkipTest('wcscoll/wcsxfrm have known bugs')
+ BaseLocalizedTest.setUp(self)
def test_strcoll_with_diacritic(self):
self.assertLess(locale.strcoll('à', 'b'), 0)