merge heads

This commit is contained in:
Georg Brandl 2013-05-12 11:24:47 +02:00
commit 831ae8454d
2 changed files with 7 additions and 0 deletions

View file

@ -297,6 +297,11 @@ class MyHandler(rpc.RPCHandler):
# page help() text to shell.
import pydoc # import must be done here to capture i/o binding
pydoc.pager = pydoc.plainpager
# Keep a reference to stdin so that it won't try to exit IDLE if
# sys.stdin gets changed from within IDLE's shell. See issue17838.
self._keep_stdin = sys.stdin
self.interp = self.get_remote_proxy("interp")
rpc.RPCHandler.getresponse(self, myseq=None, wait=0.05)

View file

@ -147,6 +147,8 @@ Library
IDLE
----
- Issue #17838: Allow sys.stdin to be reassigned.
- Issue #13495: Avoid loading the color delegator twice in IDLE.
- Issue #17798: Allow IDLE to edit new files when specified on command line.