From 74b7e44d7dbb57068788330dd4070dd502f5f945 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Mon, 1 Jun 2009 04:23:07 +0000 Subject: [PATCH] Issue #6150: Fix test_unicode on wide-unicode builds. --- Lib/test/test_unicode.py | 13 +++++++------ Misc/NEWS | 2 ++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py index 70eb871798..1ff7ee37bd 100644 --- 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 4f168c991a..4058526563 100644 --- 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. -- 2.40.0