From: Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>
Date: Fri, 24 Sep 2010 09:19:25 +0000 (+0000)
Subject: Merged revisions 84973 via svnmerge from
X-Git-Tag: v3.1.3rc1~203
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a4c8ecd32efe42895a21a1b0836c35559f8a6b23;p=python

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.
........
---

diff --git a/Lib/test/test_locale.py b/Lib/test/test_locale.py
index 6cdb67ba65..e959343cca 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)