Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
terryjreedy merged 1 commit into from
Jun 11, 2017
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions Lib/idlelib/pyshell.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,10 @@
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
Expand All @@ -32,14 +30,12 @@
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
Expand Down Expand Up @@ -1372,6 +1368,11 @@ def fix_x11_paste(root):
"""

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)
Expand Down