merge 3.4

This commit is contained in:
Benjamin Peterson 2015-02-01 18:02:21 -05:00
commit 83e814d852
1 changed files with 0 additions and 1 deletions

View File

@ -45,4 +45,3 @@ class TestCEncodeBasestringAscii(TestEncodeBasestringAscii, CTest):
s = "\uffff"*((2**32)//6 + 1) s = "\uffff"*((2**32)//6 + 1)
with self.assertRaises(OverflowError): with self.assertRaises(OverflowError):
self.json.encoder.encode_basestring_ascii(s) self.json.encoder.encode_basestring_ascii(s)