summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-02-01 23:02:15 (GMT)
committerBenjamin Peterson <benjamin@python.org>2015-02-01 23:02:15 (GMT)
commitc0b743a97ba0d762a7d58ef1f93a051629be371b (patch)
treebd6c2e4ce6143201ed2775990198e88cf792d3e4
parent3675cd9db1d7eda965df81357a11dd40e41090f7 (diff)
parent68389eaa3f9cbba8654e0121d4787e5099babd77 (diff)
downloadcpython-c0b743a97ba0d762a7d58ef1f93a051629be371b.zip
cpython-c0b743a97ba0d762a7d58ef1f93a051629be371b.tar.gz
cpython-c0b743a97ba0d762a7d58ef1f93a051629be371b.tar.bz2
merge 3.3
-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 3c014d3..a2bbc7d 100644
--- a/Lib/test/test_json/test_encode_basestring_ascii.py
+++ b/Lib/test/test_json/test_encode_basestring_ascii.py
@@ -48,4 +48,3 @@ class TestCEncodeBasestringAscii(TestEncodeBasestringAscii, CTest):
s = "\uffff"*((2**32)//6 + 1)
with self.assertRaises(OverflowError):
self.json.encoder.encode_basestring_ascii(s)
-