merge 3.4

83e814d8 · Benjamin Peterson · 71cf91cc · c0b743a9 · 83e814d8
Commit 83e814d8 authored Feb 01, 2015 by Benjamin Peterson
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

Lib/test/test_json/test_encode_basestring_ascii.py Lib/test/test_json/test_encode_basestring_ascii.py +0 -1

No files found.
--- 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)
-