Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-31 21:51:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Issue #23184: idlelib, remove more unused names and imports.

Browse source
This commit is contained in:
Terry Jan Reedy 2015-05-15 23:03:17 -04:00
parent 2733618fd9
commit 038c16b9a0
6 changed files with 10 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/idlelib/EditorWindow.py
View file

@ -13,7 +13,6 @@
import webbrowser import webbrowser
from idlelib.MultiCall import MultiCallCreator from idlelib.MultiCall import MultiCallCreator
from idlelib import idlever
from idlelib import WindowList from idlelib import WindowList
from idlelib import SearchDialog from idlelib import SearchDialog
from idlelib import GrepDialog from idlelib import GrepDialog
@ -125,7 +124,6 @@ def __init__(self, flist=None, filename=None, key=None, root=None):
EditorWindow.help_url = 'file://' + EditorWindow.help_url EditorWindow.help_url = 'file://' + EditorWindow.help_url
else: else:
EditorWindow.help_url = "https://docs.python.org/%d.%d/" % sys.version_info[:2] EditorWindow.help_url = "https://docs.python.org/%d.%d/" % sys.version_info[:2]
currentTheme=idleConf.CurrentTheme()
self.flist = flist self.flist = flist
root = root or flist.root root = root or flist.root
self.root = root self.root = root
@ -714,7 +712,7 @@ def open_turtle_demo(self, event = None):
cmd = [sys.executable, cmd = [sys.executable,
'-c', '-c',
'from turtledemo.__main__ import main; main()'] 'from turtledemo.__main__ import main; main()']
p = subprocess.Popen(cmd, shell=False) subprocess.Popen(cmd, shell=False)
def gotoline(self, lineno): def gotoline(self, lineno):
if lineno is not None and lineno > 0: if lineno is not None and lineno > 0:

17
Lib/idlelib/PyShell.py
View file

@ -10,8 +10,6 @@
import threading import threading
import time import time
import tokenize import tokenize
import traceback
import types
import io import io
import linecache import linecache
@ -32,7 +30,6 @@
from idlelib.UndoDelegator import UndoDelegator from idlelib.UndoDelegator import UndoDelegator
from idlelib.OutputWindow import OutputWindow from idlelib.OutputWindow import OutputWindow
from idlelib.configHandler import idleConf from idlelib.configHandler import idleConf
from idlelib import idlever
from idlelib import rpc from idlelib import rpc
from idlelib import Debugger from idlelib import Debugger
from idlelib import RemoteDebugger from idlelib import RemoteDebugger
@ -166,7 +163,7 @@ def set_breakpoint(self, lineno):
filename = self.io.filename filename = self.io.filename
text.tag_add("BREAK", "%d.0" % lineno, "%d.0" % (lineno+1)) text.tag_add("BREAK", "%d.0" % lineno, "%d.0" % (lineno+1))
try: try:
i = self.breakpoints.index(lineno) self.breakpoints.index(lineno)
except ValueError: # only add if missing, i.e. do once except ValueError: # only add if missing, i.e. do once
self.breakpoints.append(lineno) self.breakpoints.append(lineno)
try: # update the subprocess debugger try: # update the subprocess debugger
@ -427,7 +424,7 @@ def start_subprocess(self):
try: try:
self.rpcclt = MyRPCClient(addr) self.rpcclt = MyRPCClient(addr)
break break
except OSError as err: except OSError:
pass pass
else: else:
self.display_port_binding_error() self.display_port_binding_error()
@ -448,7 +445,7 @@ def start_subprocess(self):
self.rpcclt.listening_sock.settimeout(10) self.rpcclt.listening_sock.settimeout(10)
try: try:
self.rpcclt.accept() self.rpcclt.accept()
except socket.timeout as err: except socket.timeout:
self.display_no_subprocess_error() self.display_no_subprocess_error()
return None return None
self.rpcclt.register("console", self.tkconsole) self.rpcclt.register("console", self.tkconsole)
@ -483,7 +480,7 @@ def restart_subprocess(self, with_cwd=False):
self.spawn_subprocess() self.spawn_subprocess()
try: try:
self.rpcclt.accept() self.rpcclt.accept()
except socket.timeout as err: except socket.timeout:
self.display_no_subprocess_error() self.display_no_subprocess_error()
return None return None
self.transfer_path(with_cwd=with_cwd) self.transfer_path(with_cwd=with_cwd)
@ -501,7 +498,7 @@ def restart_subprocess(self, with_cwd=False):
# restart subprocess debugger # restart subprocess debugger
if debug: if debug:
# Restarted debugger connects to current instance of debug GUI # Restarted debugger connects to current instance of debug GUI
gui = RemoteDebugger.restart_subprocess_debugger(self.rpcclt) RemoteDebugger.restart_subprocess_debugger(self.rpcclt)
# reload remote debugger breakpoints for all PyShellEditWindows # reload remote debugger breakpoints for all PyShellEditWindows
debug.load_breakpoints() debug.load_breakpoints()
self.compile.compiler.flags = self.original_compiler_flags self.compile.compiler.flags = self.original_compiler_flags
@ -1231,7 +1228,7 @@ def runit(self):
while i > 0 and line[i-1] in " \t": while i > 0 and line[i-1] in " \t":
i = i-1 i = i-1
line = line[:i] line = line[:i]
more = self.interp.runsource(line) self.interp.runsource(line)
def open_stack_viewer(self, event=None): def open_stack_viewer(self, event=None):
if self.interp.rpcclt: if self.interp.rpcclt:
@ -1245,7 +1242,7 @@ def open_stack_viewer(self, event=None):
master=self.text) master=self.text)
return return
from idlelib.StackViewer import StackBrowser from idlelib.StackViewer import StackBrowser
sv = StackBrowser(self.root, self.flist) StackBrowser(self.root, self.flist)
def view_restart_mark(self, event=None): def view_restart_mark(self, event=None):
self.text.see("iomark") self.text.see("iomark")

2
Lib/idlelib/RemoteDebugger.py
View file

@ -98,7 +98,7 @@ def get_stack(self, fid, tbid):
else: else:
tb = tracebacktable[tbid] tb = tracebacktable[tbid]
stack, i = self.idb.get_stack(frame, tb) stack, i = self.idb.get_stack(frame, tb)
stack = [(wrap_frame(frame), k) for frame, k in stack] stack = [(wrap_frame(frame2), k) for frame2, k in stack]
return stack, i return stack, i
def run(self, cmd): def run(self, cmd):

1
Lib/idlelib/ScriptBinding.py
View file

@ -18,7 +18,6 @@
""" """
import os import os
import string
import tabnanny import tabnanny
import tokenize import tokenize
import tkinter.messagebox as tkMessageBox import tkinter.messagebox as tkMessageBox

4
Lib/idlelib/macosxSupport.py
View file

@ -123,11 +123,9 @@ def overrideRootMenu(root, flist):
# #
# Due to a (mis-)feature of TkAqua the user will also see an empty Help # Due to a (mis-)feature of TkAqua the user will also see an empty Help
# menu. # menu.
from tkinter import Menu, Text, Text from tkinter import Menu
from idlelib.EditorWindow import prepstr, get_accelerator
from idlelib import Bindings from idlelib import Bindings
from idlelib import WindowList from idlelib import WindowList
from idlelib.MultiCall import MultiCallCreator
closeItem = Bindings.menudefs[0][1][-2] closeItem = Bindings.menudefs[0][1][-2]

2
Lib/idlelib/run.py
View file

@ -1,8 +1,6 @@
import sys import sys
import io
import linecache import linecache
import time import time
import socket
import traceback import traceback
import _thread as thread import _thread as thread
import threading import threading