[Python-checkins] cpython (merge 3.6 -> default): Issue #28996: Merge 3.6.

[xavier.degaye]

https://hg.python.org/cpython/rev/5c5cf7687dc1
changeset:   105737:5c5cf7687dc1
parent:      105735:2342726ea0c0
parent:      105736:781c56168484
user:        Xavier de Gaye <xdegaye at users.sourceforge.net>
date:        Mon Dec 19 10:46:59 2016 +0100
summary:
  Issue #28996: Merge 3.6.

files:
  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
--- 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 @@
         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)

-- 
Repository URL: https://hg.python.org/cpython