diff options
| author | Xavier de Gaye <xdegaye@users.sourceforge.net> | 2016-12-19 09:46:59 (GMT) |
|---|---|---|
| committer | Xavier de Gaye <xdegaye@users.sourceforge.net> | 2016-12-19 09:46:59 (GMT) |
| commit | e0c4e961191b6289aabbf9d6aa2a6c2e98415e39 (patch) | |
| tree | 857c69b4b67f07dd098bc99dceff1c9ebbcd6e01 /Lib | |
| parent | b46edf35f3dea8c828b45d6ae02d2c716dd1d0ea (diff) | |
| parent | 5bccb0e03db7fc3356b294a0d6c7a1687533ca38 (diff) | |
| download | cpython-e0c4e961191b6289aabbf9d6aa2a6c2e98415e39.zip cpython-e0c4e961191b6289aabbf9d6aa2a6c2e98415e39.tar.gz cpython-e0c4e961191b6289aabbf9d6aa2a6c2e98415e39.tar.bz2 | |
Issue #28996: Merge 3.6.
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/test/test_locale.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_locale.py b/Lib/test/test_locale.py index fae2c3d..99fab58 100644 --- a/Lib/test/test_locale.py +++ b/Lib/test/test_locale.py @@ -1,4 +1,4 @@ -from test.support import verbose +from test.support import verbose, is_android import unittest import locale import sys @@ -353,7 +353,7 @@ class TestEnUSCollation(BaseLocalizedTest, TestCollation): 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 + if enc != 'iso8859-1' and (sys.platform == 'darwin' or is_android or sys.platform.startswith('freebsd')): raise unittest.SkipTest('wcscoll/wcsxfrm have known bugs') BaseLocalizedTest.setUp(self) |