diff -r 31fd106bb68a Lib/idlelib/FileList.py
--- a/Lib/idlelib/FileList.py	Thu Nov 20 16:45:36 2014 -0800
+++ b/Lib/idlelib/FileList.py	Wed Jan 07 21:23:38 2015 +1100
@@ -6,7 +6,6 @@
 class FileList:
 
     # N.B. this import overridden in PyShellFileList.
-    from idlelib.EditorWindow import EditorWindow
 
     def __init__(self, root):
         self.root = root
diff -r 31fd106bb68a Lib/idlelib/GrepDialog.py
--- a/Lib/idlelib/GrepDialog.py	Thu Nov 20 16:45:36 2014 -0800
+++ b/Lib/idlelib/GrepDialog.py	Wed Jan 07 21:23:38 2015 +1100
@@ -5,7 +5,6 @@
 from tkinter import StringVar, BooleanVar, Checkbutton  # for GrepDialog
 from tkinter import Tk, Text, Button, SEL, END  # for htest
 from idlelib import SearchEngine
-import itertools
 from idlelib.SearchDialogBase import SearchDialogBase
 # Importing OutputWindow fails due to import loop
 # EditorWindow -> GrepDialop -> OutputWindow -> EditorWindow
diff -r 31fd106bb68a Lib/idlelib/IOBinding.py
--- a/Lib/idlelib/IOBinding.py	Thu Nov 20 16:45:36 2014 -0800
+++ b/Lib/idlelib/IOBinding.py	Wed Jan 07 21:23:38 2015 +1100
@@ -1,5 +1,4 @@
 import os
-import types
 import shlex
 import sys
 import codecs
@@ -548,7 +547,7 @@
     text.pack()
     text.focus_set()
     editwin = MyEditWin(text)
-    io = IOBinding(editwin)
+    IOBinding(editwin)
 
 if __name__ == "__main__":
     from idlelib.idle_test.htest import run
diff -r 31fd106bb68a Lib/idlelib/PyParse.py
--- a/Lib/idlelib/PyParse.py	Thu Nov 20 16:45:36 2014 -0800
+++ b/Lib/idlelib/PyParse.py	Wed Jan 07 21:23:38 2015 +1100
@@ -1,7 +1,6 @@
 import re
 import sys
 from collections import Mapping
-from functools import partial
 
 # Reason last stmt is continued (or C_NONE if it's not).
 (C_NONE, C_BACKSLASH, C_STRING_FIRST_LINE,
diff -r 31fd106bb68a Lib/idlelib/RemoteDebugger.py
--- a/Lib/idlelib/RemoteDebugger.py	Thu Nov 20 16:45:36 2014 -0800
+++ b/Lib/idlelib/RemoteDebugger.py	Wed Jan 07 21:23:38 2015 +1100
@@ -21,7 +21,6 @@
 """
 
 import types
-from idlelib import rpc
 from idlelib import Debugger
 
 debugging = 0
@@ -93,12 +92,11 @@
         self.idb.set_return(frame)
 
     def get_stack(self, fid, tbid):
-        frame = frametable[fid]
         if tbid is None:
             tb = None
         else:
             tb = tracebacktable[tbid]
-        stack, i = self.idb.get_stack(frame, tb)
+        stack, i = self.idb.get_stack(frametable[fid], tb)
         stack = [(wrap_frame(frame), k) for frame, k in stack]
         return stack, i
 
diff -r 31fd106bb68a Lib/idlelib/ScriptBinding.py
--- a/Lib/idlelib/ScriptBinding.py	Thu Nov 20 16:45:36 2014 -0800
+++ b/Lib/idlelib/ScriptBinding.py	Wed Jan 07 21:23:38 2015 +1100
@@ -18,13 +18,10 @@
 """
 
 import os
-import re
-import string
 import tabnanny
 import tokenize
 import tkinter.messagebox as tkMessageBox
-from idlelib.EditorWindow import EditorWindow
-from idlelib import PyShell, IOBinding
+from idlelib import PyShell
 
 from idlelib.configHandler import idleConf
 from idlelib import macosxSupport
diff -r 31fd106bb68a Lib/idlelib/SearchDialog.py
--- a/Lib/idlelib/SearchDialog.py	Thu Nov 20 16:45:36 2014 -0800
+++ b/Lib/idlelib/SearchDialog.py	Wed Jan 07 21:23:38 2015 +1100
@@ -23,7 +23,7 @@
 class SearchDialog(SearchDialogBase):
 
     def create_widgets(self):
-        f = SearchDialogBase.create_widgets(self)
+        SearchDialogBase.create_widgets(self)
         self.make_button("Find Next", self.default_command, 1)
 
     def default_command(self, event=None):
diff -r 31fd106bb68a Lib/idlelib/TreeWidget.py
--- a/Lib/idlelib/TreeWidget.py	Thu Nov 20 16:45:36 2014 -0800
+++ b/Lib/idlelib/TreeWidget.py	Wed Jan 07 21:23:38 2015 +1100
@@ -245,7 +245,7 @@
         else:
             self.edit_finish()
         try:
-            label = self.label
+            self.label
         except AttributeError:
             # padding carefully selected (on Windows) to match Entry widget:
             self.label = Label(self.canvas, text=text, bd=0, padx=2, pady=2)
diff -r 31fd106bb68a Lib/idlelib/configDialog.py
--- a/Lib/idlelib/configDialog.py	Thu Nov 20 16:45:36 2014 -0800
+++ b/Lib/idlelib/configDialog.py	Wed Jan 07 21:23:38 2015 +1100
@@ -20,7 +20,6 @@
 from idlelib.keybindingDialog import GetKeysDialog
 from idlelib.configSectionNameDialog import GetCfgSectionNameDialog
 from idlelib.configHelpSourceEdit import GetHelpSourceDialog
-from idlelib.tabbedpages import TabbedPageSet
 from idlelib import macosxSupport
 class ConfigDialog(Toplevel):
 
@@ -722,7 +721,6 @@
 
     def LoadKeysList(self, keySetName):
         reselect = 0
-        newKeySet = 0
         if self.listBindings.curselection():
             reselect = 1
             listIndex = self.listBindings.index(ANCHOR)
diff -r 31fd106bb68a Lib/idlelib/macosxSupport.py
--- a/Lib/idlelib/macosxSupport.py	Thu Nov 20 16:45:36 2014 -0800
+++ b/Lib/idlelib/macosxSupport.py	Wed Jan 07 21:23:38 2015 +1100
@@ -123,11 +123,9 @@
     #
     # 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 -r 31fd106bb68a Lib/idlelib/testcode.py
--- a/Lib/idlelib/testcode.py	Thu Nov 20 16:45:36 2014 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-import string
-
-def f():
-    a = 0
-    b = 1
-    c = 2
-    d = 3
-    e = 4
-    g()
-
-def g():
-    h()
-
-def h():
-    i()
-
-def i():
-    j()
-
-def j():
-    k()
-
-def k():
-    l()
-
-l = lambda: test()
-
-def test():
-    string.capwords(1)
-
-f()