Merge with 3.2

Issue #10365: File open dialog now works instead of crashing
even when parent window is closed. Patch by Roger Serwy.

diff --cc Lib/idlelib/PyShell.py
Simple merge

diff --cc Misc/NEWS
index e26f54d4171860c94a80c679dae86e7d7979351c,4cafa5df6a456716e08a870ee9296295c3b97343..57272018d37de2198e9018a2ced66b749e188a3f
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -46,20 -67,9 +46,23 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #10365: File open dialog now works instead of crashing
+   even when parent window is closed. 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.