From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 1 Feb 2015 23:00:19 +0000 (-0500)
Subject: merge 3.4 (#23369)
X-Git-Tag: v3.5.0a1~57
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=71cf91cc09f8639cd66af9b9cd592700a44e121b;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#23369)
---

71cf91cc09f8639cd66af9b9cd592700a44e121b
diff --cc Misc/NEWS
index 9552e29586b5,84378ea58a54..40c0f015c393
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -226,9 -50,9 +226,12 @@@ Core and Builtin
  Library
  -------
  
 +- Issue #23326: Removed __ne__ implementations.  Since fixing default __ne__
 +  implementation in issue #21408 they are redundant.
 +
+ - Issue #23369: Fixed possible integer overflow in
+   _json.encode_basestring_ascii.
+ 
  - Issue #23353: Fix the exception handling of generators in
    PyEval_EvalFrameEx(). At entry, save or swap the exception state even if
    PyEval_EvalFrameEx() is called with throwflag=0. At exit, the exception state