merge 3.4 (#23369)

diff --cc Lib/test/test_json/test_encode_basestring_ascii.py
Simple merge

diff --cc Misc/NEWS
index 9552e29586b572e9b4539121d7caf3e46a241de6,84378ea58a540f4256af2ac73f6c65b77f02187d..40c0f015c393c6f40a8c237a03a34b7e2b37e1a4
--- 1/Misc/NEWS
--- 2/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

diff --cc Modules/_json.c
Simple merge