merge 3.4

2015-02-01 18:02:21 -05:00 · 2015-02-01 18:02:21 -05:00 · 83e814d852
parent 71cf91cc09 c0b743a97b
commit 83e814d852
1 changed files with 0 additions and 1 deletions
--- 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)
-