commit 1fdc7028617eefafe7a8f5848bcfdb91a2cc4987
author Serhiy Storchaka <storchaka@gmail.com> Thu Oct 31 17:06:03 2013 +0200
committer Serhiy Storchaka <storchaka@gmail.com> Thu Oct 31 17:06:03 2013 +0200
tree a03ff5c1b11153fa6bd7e407b8919c2082bd6e29
parent 41e9b401dc25418ecdfd4f525ecc7a47eea3df39

Issue #19457: Fixed xmlcharrefreplace tests on wide build when tests are
loaded from .py[co] files.

Lib/test/test_codeccallbacks.py

diff --git a/Lib/test/test_codeccallbacks.py b/Lib/test/test_codeccallbacks.py
index ecaf997..dbdb4f4 100644
--- a/Lib/test/test_codeccallbacks.py
+++ b/Lib/test/test_codeccallbacks.py
@@ -84,9 +84,9 @@
         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'),

Lib/test/test_unicode.py

diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
index 666cab8..925d25a 100644
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -1663,9 +1663,9 @@
         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"),

Misc/NEWS

diff --git a/Misc/NEWS b/Misc/NEWS
index 71de138..f0b7d37 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,12 @@
 Library
 -------
 
+Tests
+-----
+
+- Issue #19457: Fixed xmlcharrefreplace tests on wide build when tests are
+  loaded from .py[co] files.
+
 
 Whats' New in Python 2.7.6?
 ===========================