merge 3.2

This commit is contained in:
Martin v. Löwis 2012-07-11 08:29:55 +02:00
commit 9ba4545f97
2 changed files with 2 additions and 2 deletions

View File

@ -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.

View File

@ -282,7 +282,7 @@ 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