From: Martin v. Löwis <martin@v.loewis.de>
Date: Wed, 11 Jul 2012 06:29:55 +0000 (+0200)
Subject: merge 3.2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9ba4545f974a70d6740b5ef674483b6621978416;p=python

merge 3.2
---

9ba4545f974a70d6740b5ef674483b6621978416
diff --cc Lib/idlelib/NEWS.txt
index 8c33577757,b23b2a79c8..e2f31c35fe
--- a/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 e4b9279ee0,4296aaf323..e5a8e6e806
--- a/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