summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-02-01 18:02:15 -0500
committerBenjamin Peterson <benjamin@python.org>2015-02-01 18:02:15 -0500
commitb9e8389ebbe2564efc913f5a13633df877129612 (patch)
tree3565bd4571cdf9aaaa2b80bae0d330d0ffe54f13
parent596ffac4b9ff54aeb2134988bb85b3c492ae5849 (diff)
parent3262f174be948f563afcf83794ef4995af6765ec (diff)
downloadcpython-b9e8389ebbe2564efc913f5a13633df877129612.tar.gz
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 3c014d327c..a2bbc7d5ee 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)
-