Merge with 3.4

Lib/idlelib/CallTipWindow.py

@@ -2,9 +2,8 @@
 
 After ToolTip.py, which uses ideas gleaned from PySol
 Used by the CallTips IDLE extension.
-
 """
-from tkinter import *
+from tkinter import Toplevel, Label, LEFT, SOLID, TclError
 
 HIDE_VIRTUAL_EVENT_NAME = "<<calltipwindow-hide>>"
 HIDE_SEQUENCES = ("<Key-Escape>", "<FocusOut>")
@@ -133,13 +132,16 @@ class CallTip:
         return bool(self.tipwindow)
 
 
-def _calltip_window(parent):
+def _calltip_window(parent):  # htest #
+    import re
+    from tkinter import Tk, Text, LEFT, BOTH
+
     root = Tk()
     root.title("Test calltips")
     width, height, x, y = list(map(int, re.split('[x+]', parent.geometry())))
     root.geometry("+%d+%d"%(x, y + 150))
 
-    class MyEditWin: # comparenceptually an editor_window
+    class MyEditWin: # conceptually an editor_window
         def __init__(self):
             text = self.text = Text(root)
             text.pack(side=LEFT, fill=BOTH, expand=1)
@@ -161,7 +163,7 @@ def _calltip_window(parent):
         def calltip_hide(self, event):
             self.calltip.hidetip()
 
-    editwin = MyEditWin()
+    MyEditWin()
 
 if __name__=='__main__':
     from idlelib.idle_test.htest import run

Lib/idlelib/ClassBrowser.py

@@ -101,7 +101,7 @@ class ModuleBrowserTreeItem(TreeItem):
             return []
         try:
             dict = pyclbr.readmodule_ex(name, [dir] + sys.path)
-        except ImportError as msg:
+        except ImportError:
             return []
         items = []
         self.classes = {}

Lib/idlelib/Debugger.py

 import os
 import bdb
-import types
 from tkinter import *
 from idlelib.WindowList import ListedToplevel
 from idlelib.ScrolledList import ScrolledList

Lib/idlelib/configDialog.py

@@ -13,7 +13,6 @@ from tkinter import *
 import tkinter.messagebox as tkMessageBox
 import tkinter.colorchooser as tkColorChooser
 import tkinter.font as tkFont
-import copy
 
 from idlelib.configHandler import idleConf
 from idlelib.dynOptionMenuWidget import DynOptionMenu
@@ -679,7 +678,7 @@ class ConfigDialog(Toplevel):
         if self.listBindings.curselection():
             reselect=1
             listIndex=self.listBindings.index(ANCHOR)
-        keySet=idleConf.GetKeySet(keySetName)
+        # keySet=idleConf.GetKeySet(keySetName) # unused, delete?
         bindNames = list(keySet.keys())
         bindNames.sort()
         self.listBindings.delete(0,END)

Lib/idlelib/configHandler.py

@@ -20,7 +20,7 @@ configuration problem notification and resolution.
 import os
 import sys
 
-from configparser import ConfigParser, NoOptionError, NoSectionError
+from configparser import ConfigParser
 
 class InvalidConfigType(Exception): pass
 class InvalidConfigSet(Exception): pass