[Python-checkins] cpython (merge 3.2 -> default): merge 3.2

Wed Jul 11 08:30:56 CEST 2012

http://hg.python.org/cpython/rev/6d4fab44fce2
changeset: 78054:6d4fab44fce2
parent: 78052:2ecdda96f970
parent: 78053:b90482742ee0
user: Martin v. Löwis <martin at v.loewis.de>
date: Wed Jul 11 08:29:55 2012 +0200
summary:
 merge 3.2
files:
 Lib/idlelib/NEWS.txt | 2 +-
 Lib/idlelib/run.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -1,7 +1,7 @@
 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 --git a/Lib/idlelib/run.py b/Lib/idlelib/run.py
--- a/Lib/idlelib/run.py
+++ b/Lib/idlelib/run.py
@@ -282,7 +282,7 @@
 """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
-- 
Repository URL: http://hg.python.org/cpython
