diff options
| -rw-r--r-- | Lib/idlelib/EditorWindow.py | 4 | ||||
| -rwxr-xr-x | Lib/idlelib/PyShell.py | 17 | ||||
| -rw-r--r-- | Lib/idlelib/RemoteDebugger.py | 2 | ||||
| -rw-r--r-- | Lib/idlelib/ScriptBinding.py | 1 | ||||
| -rw-r--r-- | Lib/idlelib/macosxSupport.py | 4 | ||||
| -rw-r--r-- | Lib/idlelib/run.py | 2 |
6 files changed, 10 insertions, 20 deletions
diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py index 1520ad0..ef35ffe 100644 --- a/Lib/idlelib/EditorWindow.py +++ b/Lib/idlelib/EditorWindow.py @@ -13,7 +13,6 @@ import traceback import webbrowser from idlelib.MultiCall import MultiCallCreator -from idlelib import idlever from idlelib import WindowList from idlelib import SearchDialog from idlelib import GrepDialog @@ -125,7 +124,6 @@ class EditorWindow(object): EditorWindow.help_url = 'file://' + EditorWindow.help_url else: EditorWindow.help_url = "https://docs.python.org/%d.%d/" % sys.version_info[:2] - currentTheme=idleConf.CurrentTheme() self.flist = flist root = root or flist.root self.root = root @@ -714,7 +712,7 @@ class EditorWindow(object): cmd = [sys.executable, '-c', 'from turtledemo.__main__ import main; main()'] - p = subprocess.Popen(cmd, shell=False) + subprocess.Popen(cmd, shell=False) def gotoline(self, lineno): if lineno is not None and lineno > 0: diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py index 51aa3f4..a5236ab 100755 --- a/Lib/idlelib/PyShell.py +++ b/Lib/idlelib/PyShell.py @@ -10,8 +10,6 @@ import sys import threading import time import tokenize -import traceback -import types import io import linecache @@ -32,7 +30,6 @@ from idlelib.ColorDelegator import ColorDelegator from idlelib.UndoDelegator import UndoDelegator from idlelib.OutputWindow import OutputWindow from idlelib.configHandler import idleConf -from idlelib import idlever from idlelib import rpc from idlelib import Debugger from idlelib import RemoteDebugger @@ -166,7 +163,7 @@ class PyShellEditorWindow(EditorWindow): filename = self.io.filename text.tag_add("BREAK", "%d.0" % lineno, "%d.0" % (lineno+1)) try: - i = self.breakpoints.index(lineno) + self.breakpoints.index(lineno) except ValueError: # only add if missing, i.e. do once self.breakpoints.append(lineno) try: # update the subprocess debugger @@ -427,7 +424,7 @@ class ModifiedInterpreter(InteractiveInterpreter): try: self.rpcclt = MyRPCClient(addr) break - except OSError as err: + except OSError: pass else: self.display_port_binding_error() @@ -448,7 +445,7 @@ class ModifiedInterpreter(InteractiveInterpreter): self.rpcclt.listening_sock.settimeout(10) try: self.rpcclt.accept() - except socket.timeout as err: + except socket.timeout: self.display_no_subprocess_error() return None self.rpcclt.register("console", self.tkconsole) @@ -483,7 +480,7 @@ class ModifiedInterpreter(InteractiveInterpreter): self.spawn_subprocess() try: self.rpcclt.accept() - except socket.timeout as err: + except socket.timeout: self.display_no_subprocess_error() return None self.transfer_path(with_cwd=with_cwd) @@ -501,7 +498,7 @@ class ModifiedInterpreter(InteractiveInterpreter): # restart subprocess debugger if debug: # 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 debug.load_breakpoints() self.compile.compiler.flags = self.original_compiler_flags @@ -1231,7 +1228,7 @@ class PyShell(OutputWindow): while i > 0 and line[i-1] in " \t": i = i-1 line = line[:i] - more = self.interp.runsource(line) + self.interp.runsource(line) def open_stack_viewer(self, event=None): if self.interp.rpcclt: @@ -1245,7 +1242,7 @@ class PyShell(OutputWindow): master=self.text) return from idlelib.StackViewer import StackBrowser - sv = StackBrowser(self.root, self.flist) + StackBrowser(self.root, self.flist) def view_restart_mark(self, event=None): self.text.see("iomark") diff --git a/Lib/idlelib/RemoteDebugger.py b/Lib/idlelib/RemoteDebugger.py index 6672ba6..be2262f 100644 --- a/Lib/idlelib/RemoteDebugger.py +++ b/Lib/idlelib/RemoteDebugger.py @@ -98,7 +98,7 @@ class IdbAdapter: else: tb = tracebacktable[tbid] 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 def run(self, cmd): diff --git a/Lib/idlelib/ScriptBinding.py b/Lib/idlelib/ScriptBinding.py index 3d11e97..e71ddf4 100644 --- a/Lib/idlelib/ScriptBinding.py +++ b/Lib/idlelib/ScriptBinding.py @@ -18,7 +18,6 @@ XXX GvR Redesign this interface (yet again) as follows: """ import os -import string import tabnanny import tokenize import tkinter.messagebox as tkMessageBox diff --git a/Lib/idlelib/macosxSupport.py b/Lib/idlelib/macosxSupport.py index 65bd688..5813749 100644 --- a/Lib/idlelib/macosxSupport.py +++ b/Lib/idlelib/macosxSupport.py @@ -123,11 +123,9 @@ def overrideRootMenu(root, flist): # # Due to a (mis-)feature of TkAqua the user will also see an empty Help # menu. - from tkinter import Menu, Text, Text - from idlelib.EditorWindow import prepstr, get_accelerator + from tkinter import Menu from idlelib import Bindings from idlelib import WindowList - from idlelib.MultiCall import MultiCallCreator closeItem = Bindings.menudefs[0][1][-2] diff --git a/Lib/idlelib/run.py b/Lib/idlelib/run.py index 13cec62..228875c 100644 --- a/Lib/idlelib/run.py +++ b/Lib/idlelib/run.py @@ -1,8 +1,6 @@ import sys -import io import linecache import time -import socket import traceback import _thread as thread import threading |