From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 1 Nov 2013 00:22:41 +0000 (-0400)
Subject: fix xmlcharrefreplace tests on wide build when tests are loaded from .py[co] files.
X-Git-Tag: v2.7.8~311^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9fa6a8ba63dc409a0a50605c59adfdc58f7b0085;p=python

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 ecaf9970a1..dbdb4f4507 100644
--- a/Lib/test/test_codeccallbacks.py
+++ b/Lib/test/test_codeccallbacks.py
@@ -84,9 +84,9 @@ class CodecCallbackTest(unittest.TestCase):
         tests = [(u'\U0001f49d', '&#128157;'),
                  (u'\ud83d', '&#55357;'),
                  (u'\udc9d', '&#56477;'),
-                 (u'\ud83d\udc9d', '&#128157;' if len(u'\U0001f49d') > 1 else
-                                   '&#55357;&#56477;'),
                 ]
+        if u'\ud83d\udc9d' != u'\U0001f49d':
+            tests += [(u'\ud83d\udc9d', '&#55357;&#56477;')]
         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 666cab8725..925d25a15b 100644
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -1663,9 +1663,9 @@ class UnicodeTest(
         tests = [(u'\U0001f49d', '&#128157;'),
                  (u'\ud83d', '&#55357;'),
                  (u'\udc9d', '&#56477;'),
-                 (u'\ud83d\udc9d', '&#128157;' if len(u'\U0001f49d') > 1 else
-                                  '&#55357;&#56477;'),
                 ]
+        if u'\ud83d\udc9d' != u'\U0001f49d':
+            tests += [(u'\ud83d\udc9d', '&#55357;&#56477;')]
         for s, exp in tests:
             self.assertEqual(
                     unicode_encodedecimal(u"123" + s, "xmlcharrefreplace"),
diff --git a/Misc/NEWS b/Misc/NEWS
index 79ab674af6..c353571854 100644
--- 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?
 ===============================================