fix xmlcharrefreplace tests on wide build when tests are loaded from .py[co] files.

diff --git a/Lib/test/test_codeccallbacks.py b/Lib/test/test_codeccallbacks.py
index ecaf9970a1ddbb72b3768dd9011828aa67e5ffb2..dbdb4f4507a365389b309174161c833969ba4b20 100644 (file)
--- a/Lib/test/test_codeccallbacks.py
+++ b/Lib/test/test_codeccallbacks.py
@@ -84,9 +84,9 @@ class CodecCallbackTest(unittest.TestCase):
         tests = [(u'\U0001f49d', '💝'),
                  (u'\ud83d', '�'),
                  (u'\udc9d', '�'),
-                 (u'\ud83d\udc9d', '💝' if len(u'\U0001f49d') > 1 else
-                                   '��'),
                 ]
+        if u'\ud83d\udc9d' != u'\U0001f49d':
+            tests += [(u'\ud83d\udc9d', '��')]
         for encoding in ['ascii', 'latin1', 'iso-8859-15']:
             for s, exp in tests:
                 self.assertEqual(s.encode(encoding, 'xmlcharrefreplace'),

diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
index 666cab87255eaa9ee7cbd6a78a721feba3fc5a0a..925d25a15bd60a1b7e2e45b9fda0db982a991bb1 100644 (file)
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -1663,9 +1663,9 @@ class UnicodeTest(
         tests = [(u'\U0001f49d', '💝'),
                  (u'\ud83d', '�'),
                  (u'\udc9d', '�'),
-                 (u'\ud83d\udc9d', '💝' if len(u'\U0001f49d') > 1 else
-                                  '��'),
                 ]
+        if u'\ud83d\udc9d' != u'\U0001f49d':
+            tests += [(u'\ud83d\udc9d', '��')]
         for s, exp in tests:
             self.assertEqual(
                     unicode_encodedecimal(u"123" + s, "xmlcharrefreplace"),

diff --git a/Misc/NEWS b/Misc/NEWS
index 79ab674af6714cde7dd66f233d211dda3b3919b2..c353571854ac5935315c4afb8c09da85f13fec03 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -16,6 +16,12 @@ IDLE
 
 - Issue #19426: Fixed the opening of Python source file with specified encoding.
 
+Tests
+-----
+
+- Issue #19457: Fixed xmlcharrefreplace tests on wide build when tests are
+  loaded from .py[co] files.
+
 
 What's New in Python 2.7.6 release candidate 1?
 ===============================================