From: Martin v. Löwis <martin@v.loewis.de>
Date: Wed, 25 Jul 2012 08:49:32 +0000 (+0200)
Subject: merge 3.2
X-Git-Tag: v3.3.0b2~110
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f4b341b0e6fa19e2ae88df754081a24ef1eaf033;p=python

merge 3.2
---

f4b341b0e6fa19e2ae88df754081a24ef1eaf033
diff --cc Lib/idlelib/NEWS.txt
index 0cdf7a6717,ed9e105949..6b430b5bf1
--- a/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/run.py
index 464861f5f2,53656806d6..9872af4251
--- a/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