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

(cherry-pick IDLE pyshell change from 7e4db2f)
This commit is contained in:
terryjreedy 2017-06-11 00:34:20 -04:00 committed by GitHub
parent 556cddba77
commit c0ef607c52

View file

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