merge heads

2 files changed, 7 insertions, 0 deletions

diff --git a/Lib/idlelib/run.py b/Lib/idlelib/run.py
index d10591246f..88da23ba07 100644
--- a/Lib/idlelib/run.py
+++ b/Lib/idlelib/run.py
@@ -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)
 
diff --git a/Misc/NEWS b/Misc/NEWS
index c74107622a..a2da8e03d0 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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.