[Python-checkins] r84990 - in python/branches/release31-maint: Lib/test/test_locale.py

Fri Sep 24 11:19:25 CEST 2010

Author: hirokazu.yamamoto
Date: Fri Sep 24 11:19:25 2010
New Revision: 84990
Log:
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.
........
Modified:
 python/branches/release31-maint/ (props changed)
 python/branches/release31-maint/Lib/test/test_locale.py
Modified: python/branches/release31-maint/Lib/test/test_locale.py
==============================================================================

--- python/branches/release31-maint/Lib/test/test_locale.py	(original)
+++ python/branches/release31-maint/Lib/test/test_locale.py	Fri Sep 24 11:19:25 2010
@@ -352,13 +352,13 @@
 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)
