Issue #6150: Fix test_unicode on wide-unicode builds.

diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
index 70eb871798f7f82e6c6b5e24baf6ccbee64cb83a..1ff7ee37bd1080272677353a6e605708b58ad1ee 100644 (file)
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -908,14 +908,15 @@ class UnicodeTest(
     def test_codecs_utf8(self):
         self.assertEqual(''.encode('utf-8'), b'')
         self.assertEqual('\u20ac'.encode('utf-8'), b'\xe2\x82\xac')
-        self.assertEqual('\ud800\udc02'.encode('utf-8'), b'\xf0\x90\x80\x82')
-        self.assertEqual('\ud84d\udc56'.encode('utf-8'), b'\xf0\xa3\x91\x96')
+        if sys.maxunicode == 65535:
+            self.assertEqual('\ud800\udc02'.encode('utf-8'), b'\xf0\x90\x80\x82')
+            self.assertEqual('\ud84d\udc56'.encode('utf-8'), b'\xf0\xa3\x91\x96')
         self.assertEqual('\ud800'.encode('utf-8', 'surrogatepass'), b'\xed\xa0\x80')
         self.assertEqual('\udc00'.encode('utf-8', 'surrogatepass'), b'\xed\xb0\x80')
-        self.assertEqual(
-            ('\ud800\udc02'*1000).encode('utf-8', 'surrogatepass'),
-            b'\xf0\x90\x80\x82'*1000
-        )
+        if sys.maxunicode == 65535:
+            self.assertEqual(
+                ('\ud800\udc02'*1000).encode('utf-8'),
+                b'\xf0\x90\x80\x82'*1000)
         self.assertEqual(
             '\u6b63\u78ba\u306b\u8a00\u3046\u3068\u7ffb\u8a33\u306f'
             '\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\u4e00'

diff --git a/Misc/NEWS b/Misc/NEWS
index 4f168c991a9e5c42eefc39237851b04d7543eee8..4058526563a6394d1ad544f21370c78d581af324 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -18,6 +18,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #6150: Fix test_unicode on wide-unicode builds.
+
 - Issue #6149: Fix initialization of WeakValueDictionary objects from non-empty
   parameters.