[Python-checkins] cpython (2.7): Fixed JSON tests on wide build when ran from *.pyc files (issue #11489).

Sun Dec 1 16:31:25 CET 2013

http://hg.python.org/cpython/rev/02d186e3af09
changeset: 87680:02d186e3af09
branch: 2.7
parent: 87669:d964d7023aa4
user: Serhiy Storchaka <storchaka at gmail.com>
date: Sun Dec 01 17:30:55 2013 +0200
summary:
 Fixed JSON tests on wide build when ran from *.pyc files (issue #11489).
files:
 Lib/json/tests/test_scanstring.py | 5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Lib/json/tests/test_scanstring.py b/Lib/json/tests/test_scanstring.py
--- a/Lib/json/tests/test_scanstring.py
+++ b/Lib/json/tests/test_scanstring.py
@@ -100,14 +100,15 @@
 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):
-- 
Repository URL: http://hg.python.org/cpython
