[Python-checkins] cpython (merge 3.3 -> 3.4): merge 3.3

Mon Feb 2 00:02:56 CET 2015

https://hg.python.org/cpython/rev/a8737f0bbb7a
changeset: 94442:a8737f0bbb7a
branch: 3.4
parent: 94439:4f47509d7417
parent: 94441:1801b2571587
user: Benjamin Peterson <benjamin at python.org>
date: Sun Feb 01 18:02:15 2015 -0500
summary:
 merge 3.3
files:
 Lib/test/test_json/test_encode_basestring_ascii.py | 1 -
 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
--- a/Lib/test/test_json/test_encode_basestring_ascii.py
+++ b/Lib/test/test_json/test_encode_basestring_ascii.py
@@ -48,4 +48,3 @@
 s = "\uffff"*((2**32)//6 + 1)
 with self.assertRaises(OverflowError):
 self.json.encoder.encode_basestring_ascii(s)
-
-- 
Repository URL: https://hg.python.org/cpython
