From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sun, 1 Dec 2013 15:30:55 +0000 (+0200)
Subject: Fixed JSON tests on wide build when ran from *.pyc files (issue #11489).
X-Git-Tag: v2.7.8~224
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7546220f06b0f9af52ef85aad2bb7a54a1b9e3f3;p=python

Fixed JSON tests on wide build when ran from *.pyc files (issue #11489).
---

diff --git a/Lib/json/tests/test_scanstring.py b/Lib/json/tests/test_scanstring.py
index d17ebdd1ca..ed80a4135a 100644
--- a/Lib/json/tests/test_scanstring.py
+++ b/Lib/json/tests/test_scanstring.py
@@ -100,14 +100,15 @@ class TestScanstring(object):
                 self.assertEqual(scanstring(given, 1, None, True),
                                  (expect, len(given)))
 
+        surrogates = unichr(0xd834) + unichr(0xdd20)
         assertScan('"z\\ud834\\u0079x"', u'z\ud834yx')
         assertScan('"z\\ud834\\udd20x"', u'z\U0001d120x')
         assertScan('"z\\ud834\\ud834\\udd20x"', u'z\ud834\U0001d120x')
         assertScan('"z\\ud834x"', u'z\ud834x')
-        assertScan(u'"z\\ud834\udd20x12345"', u'z\ud834\udd20x12345')
+        assertScan(u'"z\\ud834\udd20x12345"', u'z%sx12345' % surrogates)
         assertScan('"z\\udd20x"', u'z\udd20x')
         assertScan(u'"z\ud834\udd20x"', u'z\ud834\udd20x')
-        assertScan(u'"z\ud834\\udd20x"', u'z\ud834\udd20x')
+        assertScan(u'"z\ud834\\udd20x"', u'z%sx' % surrogates)
         assertScan(u'"z\ud834x"', u'z\ud834x')
 
     def test_bad_escapes(self):