From: terryjreedy <tjreedy@udel.edu>
Date: Sun, 11 Jun 2017 04:34:20 +0000 (-0400)
Subject: [3.6] bpo-30166: backport pyshell changes (GH 1293) (#2098)
X-Git-Tag: v3.6.2rc1~56
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c0ef607c52e58e94693fbedb27f2813bc3fed8fa;p=python

[3.6] bpo-30166: backport pyshell changes (GH 1293) (#2098)

(cherry-pick IDLE pyshell change from 7e4db2f)
---

diff --git a/Lib/idlelib/pyshell.py b/Lib/idlelib/pyshell.py
index dd6c997abc..5b0e5b2676 100755
--- a/Lib/idlelib/pyshell.py
+++ b/Lib/idlelib/pyshell.py
@@ -18,12 +18,10 @@ if TkVersion < 8.5:
     raise SystemExit(1)
 
 from code import InteractiveInterpreter
-import getopt
-import io
 import linecache
 import os
 import os.path
-from platform import python_version, system
+from platform import python_version
 import re
 import socket
 import subprocess
@@ -32,14 +30,12 @@ import time
 import tokenize
 import warnings
 
-from idlelib import testing  # bool value
 from idlelib.colorizer import ColorDelegator
 from idlelib.config import idleConf
 from idlelib import debugger
 from idlelib import debugger_r
 from idlelib.editor import EditorWindow, fixwordbreaks
 from idlelib.filelist import FileList
-from idlelib import macosx
 from idlelib.outwin import OutputWindow
 from idlelib import rpc
 from idlelib.run import idle_formatwarning, PseudoInputFile, PseudoOutputFile
@@ -1372,6 +1368,11 @@ echo "import sys; print(sys.argv)" | idle - "foobar"
 """
 
 def main():
+    import getopt
+    from platform import system
+    from idlelib import testing  # bool value
+    from idlelib import macosx
+
     global flist, root, use_subprocess
 
     capture_warnings(True)