#14254: merge with 3.3.

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

diff --cc Misc/NEWS
index 0badc3f9bab3825cd5d472e26ee24f0c47622fa5,621cdaa7e47dc41c3b913fd4c4d6e2570a5604ea..74fb8d241ec2e9c5adf8b6ebb4931ac9c2000f86
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -302,28 -229,8 +302,30 @@@ Core and Builtin
  Library
  -------
  
++- Issue #14254: IDLE now handles readline correctly across shell restarts.
++
 +- Issue #17614: IDLE no longer raises exception when quickly closing a file.
 +
 +- Issue #6698: IDLE now opens just an editor window when configured to do so.
 +
 +- Issue #8900: Using keyboard shortcuts in IDLE to open a file no longer 
 +  raises an exception.
 +
 +- Issue #6649: Fixed missing exit status in IDLE. Patch by Guilherme Polo.
 +
 +- Issue #17435: threading.Timer's __init__ method no longer uses mutable
 +  default values for the args and kwargs parameters.
 +
 +- Issue #17526: fix an IndexError raised while passing code without filename to
 +  inspect.findsource().  Initial patch by Tyler Doyle.
 +
  - Issue #17540: Added style to formatter configuration by dict.
  
 +- Issue #16692: The ssl module now supports TLS 1.1 and TLS 1.2.  Initial
 +  patch by Michele Orrù.
 +
 +- Issue #17025: multiprocessing: Reduce Queue and SimpleQueue contention.
 +
  - Issue #17536: Add to webbrowser's browser list: www-browser, x-www-browser,
    iceweasel, iceape.