Merge from 3.2, #12510

diff --cc Lib/idlelib/NEWS.txt
index 29398e299e95aaa903aebb72d7d609cdd2c0a75f,d57237d36ba03feedb4bfba9c31246a8309978d1..ff23c6d1bc7651a6cdd95a18528966b89eb03c9c
--- 1/Lib/idlelib/NEWS.txt
--- 2/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@@ -1,6 -1,14 +1,14 @@@
 -What's New in IDLE 3.2.4?
 +What's New in IDLE 3.3.0?
  =========================
  
+ - Issue # 12510: Attempt to get certain tool tips no longer crashes IDLE.
+   Erroneous tool tips have been corrected. Default added for callables.
+ 
+ - Issue10365: File open dialog now works instead of crashing even when
+   parent window is closed while dialog is open.
+ 
+ - Issue 14876: use user-selected font for highlight configuration.
+ 
  - Issue #14937: Perform auto-completion of filenames in strings even for
    non-ASCII filenames. Likewise for identifiers.
  

diff --cc Misc/NEWS
index 25e353869f84a730e7338247678c6ed2b729c3d1,bd79b257abf1684afadb0f0e970702810c8ea922..caa31b37d184e3edd329a342df61d18aebc4df22
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -144,40 -89,16 +144,41 @@@ Librar
  - Issue #14443: Tell rpmbuild to use the correct version of Python in
    bdist_rpm. Initial patch by Ross Lagerwall.
  
- - Issue #14929: Stop Idle 3.x from closing on Unicode decode errors when grepping.
-   Patch by Roger Serwy.
+ - Issue #14929: Stop Idle 3.x from closing on Unicode decode errors when
+   grepping. Patch by Roger Serwy.
  
 +- Issue #12515: email now registers a defect if it gets to EOF while parsing
 +  a MIME part without seeing the closing MIME boundary.
 +
  - Issue #12510: Attempting to get invalid tooltip no longer closes Idle.
-   Original patch by Roger Serwy.
+   Other tooltipss have been corrected or improved and the number of tests
+   has been tripled. Original patch by Roger Serwy.
  
- - Issue #10365: File open dialog now works instead of crashing
-   even when parent window is closed. Patch by Roger Serwy.
 +- Issue #1672568: email now always decodes base64 payloads, adding padding and
 +  ignoring non-base64-alphabet characters if needed, and registering defects
 +  for any such problems.
 +
 +- Issue #14925: email now registers a defect when the parser decides that there
 +  is a missing header/body separator line.  MalformedHeaderDefect, which the
 +  existing code would never actually generate, is deprecated.
 +
+ - Issue #10365: File open dialog now works instead of crashing even when
+   the parent window is closed before the dialog. Patch by Roger Serwy.
  
 +- Issue #8739: Updated smtpd to support RFC 5321, and added support for the
 +  RFC 1870 SIZE extension.
 +
 +- Issue #665194: Added a localtime function to email.utils to provide an
 +  aware local datetime for use in setting Date headers.
 +
 +- Issue #12586: Added new provisional policies that implement convenient
 +  unicode support for email headers.  See What's New for details.
 +
 +- Issue #14731: Refactored email Policy framework to support full backward
 +  compatibility with Python 3.2 by default yet allow for the introduction of
 +  new features through new policies.  Note that Policy.must_be_7bit is renamed
 +  to cte_type.
 +
  - Issue #14876: Use user-selected font for highlight configuration.
  
  - Issue #14920: Fix the help(urllib.parse) failure on locale C on terminals.