merge 3.2

diff --cc Lib/idlelib/NEWS.txt
index 8c33577757ae8b19c086483a430fe9449cb1363e,b23b2a79c84e084d84a03fc079e3a221286cccb4..e2f31c35fec1e01ffffd57eaf69bfd55d17000a9
--- 1/Lib/idlelib/NEWS.txt
--- 2/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@@ -1,7 -1,7 +1,7 @@@
 -What's New in IDLE 3.2.4?
 +What's New in IDLE 3.3.0?
  =========================
  
- - Issue #13532: Check that arguments to sys.stdout.write are strings.
+ - Issue #13532, #15319: Check that arguments to sys.stdout.write are strings.
  
  - Issue # 12510: Attempt to get certain tool tips no longer crashes IDLE.
    Erroneous tool tips have been corrected. Default added for callables.

diff --cc Lib/idlelib/run.py
index e4b9279ee0aef43b38150a9e0c0563fd7cad2d54,4296aaf3236daddff6bfc8e6e842765ac5e0557f..e5a8e6e8060734cbc28f2fab3f62712aa74430cc
--- 1/Lib/idlelib/run.py
--- 2/Lib/idlelib/run.py
+++ b/Lib/idlelib/run.py
@@@ -282,10 -269,9 +282,10 @@@ class MyHandler(rpc.RPCHandler)
          """Override base method"""
          executive = Executive(self)
          self.register("exec", executive)
-         sys.stdin = self.console = _RPCFile(self.get_remote_proxy("stdin"))
+         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"))
 +        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