merge 3.2

diff --cc Lib/idlelib/NEWS.txt
index 0cdf7a6717952f8254172d4ae41ef611774bdaf4,ed9e105949fa4076192d8338c9b676544bc93f84..6b430b5bf15525908909f90673dae67802c270d4
--- 1/Lib/idlelib/NEWS.txt
--- 2/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@@ -1,9 -1,8 +1,11 @@@
 -What's New in IDLE 3.2.4?
 +What's New in IDLE 3.3.0?
  =========================
  
+ - Issue #15318: Prevent writing to sys.stdin.
+ 
 +- Issue #4832: Modify IDLE to save files with .py extension by
 +  default on Windows and OS X (Tk 8.5) as it already does with X11 Tk.
 +
  - Issue #13532, #15319: Check that arguments to sys.stdout.write are strings.
  
  - Issue # 12510: Attempt to get certain tool tips no longer crashes IDLE.

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

diff --cc Lib/idlelib/run.py
index 464861f5f270aa5b4655b28cba9dfd654ad74cdb,53656806d6d8e44da2376b043b36052777728968..9872af425179a0993f71b16298dc67b9ae9044eb
--- 1/Lib/idlelib/run.py
--- 2/Lib/idlelib/run.py
+++ b/Lib/idlelib/run.py
@@@ -288,10 -291,10 +304,11 @@@ class MyHandler(rpc.RPCHandler)
          """Override base method"""
          executive = Executive(self)
          self.register("exec", executive)
-         sys.stdin = self.console = self.get_remote_proxy("stdin")
-         sys.stdout = _RPCFile(self.get_remote_proxy("stdout"))
-         sys.stderr = _RPCFile(self.get_remote_proxy("stderr"))
+         self.console = self.get_remote_proxy("stdin")
+         sys.stdin = _RPCInputFile(self.console)
+         sys.stdout = _RPCOutputFile(self.get_remote_proxy("stdout"))
+         sys.stderr = _RPCOutputFile(self.get_remote_proxy("stderr"))
 +        sys.displayhook = rpc.displayhook
          # page help() text to shell.
          import pydoc # import must be done here to capture i/o binding
          pydoc.pager = pydoc.plainpager