summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-02-01 23:02:21 (GMT)
committerBenjamin Peterson <benjamin@python.org>2015-02-01 23:02:21 (GMT)
commit83e814d8526b74a80fdf7a4c901f689d15cb1f5d (patch)
treee287566387129e77664c802fbe7f07d5e7423077
parent71cf91cc09f8639cd66af9b9cd592700a44e121b (diff)
parentc0b743a97ba0d762a7d58ef1f93a051629be371b (diff)
downloadcpython-83e814d8526b74a80fdf7a4c901f689d15cb1f5d.zip
cpython-83e814d8526b74a80fdf7a4c901f689d15cb1f5d.tar.gz
cpython-83e814d8526b74a80fdf7a4c901f689d15cb1f5d.tar.bz2
merge 3.4
-rw-r--r--Lib/test/test_json/test_encode_basestring_ascii.py1
1 files changed, 0 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
index 5c363dc..8cd0c94 100644
--- a/Lib/test/test_json/test_encode_basestring_ascii.py
+++ b/Lib/test/test_json/test_encode_basestring_ascii.py
@@ -45,4 +45,3 @@ class TestCEncodeBasestringAscii(TestEncodeBasestringAscii, CTest):
s = "\uffff"*((2**32)//6 + 1)
with self.assertRaises(OverflowError):
self.json.encoder.encode_basestring_ascii(s)
-