diff options
| author | Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> | 2010-09-24 09:19:25 (GMT) |
|---|---|---|
| committer | Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> | 2010-09-24 09:19:25 (GMT) |
| commit | a4c8ecd32efe42895a21a1b0836c35559f8a6b23 (patch) | |
| tree | 18530ee7561254d3f4e65b62c43dc07092280ddd | |
| parent | a67c70d4a945e9fc5f37165d1c61e6955e0dc8c8 (diff) | |
| download | cpython-a4c8ecd32efe42895a21a1b0836c35559f8a6b23.zip cpython-a4c8ecd32efe42895a21a1b0836c35559f8a6b23.tar.gz cpython-a4c8ecd32efe42895a21a1b0836c35559f8a6b23.tar.bz2 | |
Merged revisions 84973 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r84973 | hirokazu.yamamoto | 2010-09-24 00:20:15 +0900 | 2 lines
Issue #9868: locale was left changed after TestEnUSCollation#setUp raised
TestSkip exception.
........
| -rw-r--r-- | Lib/test/test_locale.py | 2 |
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) |