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

[benjamin.peterson]

https://hg.python.org/cpython/rev/cf4f7a572b79
changeset:   94443:cf4f7a572b79
parent:      94440:02aeca4974ac
parent:      94442:a8737f0bbb7a
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Feb 01 18:02:21 2015 -0500
summary:
  merge 3.4

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
@@ -45,4 +45,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