Merge from 3.2

diff --cc Misc/NEWS
index 1e7d9acb536c5f33f146a5d6d3463b239b37f37f,b8b65d249dbf32c9d118dc38cd39aa2b68c7bf8e..c9946bc60256b73413ee6b50a54b52b0e9667d6c
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -142,10 -85,12 +142,13 @@@ Core and Builtin
  
  Library
  -------
+ - Issue #1028: Tk returns invalid Unicode null in %A: UnicodeDecodeError.
+   With Tk < 8.5 _tkinter.c:PythonCmd() raised UnicodeDecodeError, caused
+   IDLE to exit.  Converted to valid Unicode null in PythonCmd().
  
 -- Issue #11169: compileall module uses repr() to format filenames and paths to
 -  escape surrogate characters and show spaces.
 +- Issue #11799: urllib.request Authentication Handlers will raise a ValueError
 +  when presented with an unsupported Authentication Scheme. Patch contributed
 +  by Yuval Greenfield.
  
  - Issue #10419, #6011: build_scripts command of distutils handles correctly
    non-ASCII path (path to the Python executable). Open and write the script in

diff --cc Modules/_tkinter.c
Simple merge