[Python-checkins] cpython (merge 3.4 -> default): merge 3.4

[benjamin.peterson]

https://hg.python.org/cpython/rev/651aa21433ba
changeset:   94473:651aa21433ba
parent:      94470:298f56ee74f4
parent:      94472:b883bb8bd744
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Feb 02 17:47:31 2015 -0500
summary:
  merge 3.4

files:
  Lib/test/test_json/test_encode_basestring_ascii.py |  3 ++-
  1 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_json/test_encode_basestring_ascii.py b/Lib/test/test_json/test_encode_basestring_ascii.py
--- a/Lib/test/test_json/test_encode_basestring_ascii.py
+++ b/Lib/test/test_json/test_encode_basestring_ascii.py
@@ -42,6 +42,7 @@
 class TestCEncodeBasestringAscii(TestEncodeBasestringAscii, CTest):
     @bigaddrspacetest
     def test_overflow(self):
-        s = "\uffff"*((2**32)//6 + 1)
+        size = (2**32)//6 + 1
+        s = "\x00"*size
         with self.assertRaises(OverflowError):
             self.json.encoder.encode_basestring_ascii(s)

-- 
Repository URL: https://hg.python.org/cpython