From 35d69e0a77127265efe51e53eaaf706b12b7d8f4 Mon Sep 17 00:00:00 2001
From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sun, 11 Jun 2017 05:17:26 -0400
Subject: [PATCH 1/2] [3.6]bpo-29919: Remove unused idlelib imports

---
 Lib/idlelib/config.py                    | 2 +-
 Lib/idlelib/idle_test/test_config.py     | 2 --
 Lib/idlelib/idle_test/test_config_key.py | 2 +-
 Lib/idlelib/idle_test/test_editor.py     | 2 --
 Lib/idlelib/idle_test/test_searchbase.py | 2 +-
 5 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/Lib/idlelib/config.py b/Lib/idlelib/config.py
index 358bee4803b0c1..6a9fc61c2b59d7 100644
--- a/Lib/idlelib/config.py
+++ b/Lib/idlelib/config.py
@@ -29,7 +29,7 @@
 import os
 import sys
 
-from tkinter.font import Font, nametofont
+from tkinter.font import Font
 
 class InvalidConfigType(Exception): pass
 class InvalidConfigSet(Exception): pass
diff --git a/Lib/idlelib/idle_test/test_config.py b/Lib/idlelib/idle_test/test_config.py
index a3fa1a341a1642..e678cc6f332670 100644
--- a/Lib/idlelib/idle_test/test_config.py
+++ b/Lib/idlelib/idle_test/test_config.py
@@ -3,9 +3,7 @@
 Much is tested by opening config dialog live or in test_configdialog.
 Coverage: 27%
 '''
-from sys import modules
 from test.support import captured_stderr
-from tkinter import Tk
 import unittest
 from idlelib import config
 
diff --git a/Lib/idlelib/idle_test/test_config_key.py b/Lib/idlelib/idle_test/test_config_key.py
index ee3f2c835c98b7..8a24c9632b7224 100644
--- a/Lib/idlelib/idle_test/test_config_key.py
+++ b/Lib/idlelib/idle_test/test_config_key.py
@@ -6,7 +6,7 @@
 from test.support import requires
 requires('gui')
 import unittest
-from tkinter import Tk, Text
+from tkinter import Tk
 
 
 class GetKeysTest(unittest.TestCase):
diff --git a/Lib/idlelib/idle_test/test_editor.py b/Lib/idlelib/idle_test/test_editor.py
index e9d29d45b82345..64a2a88b7e3765 100644
--- a/Lib/idlelib/idle_test/test_editor.py
+++ b/Lib/idlelib/idle_test/test_editor.py
@@ -1,7 +1,5 @@
 import unittest
-from tkinter import Tk, Text
 from idlelib.editor import EditorWindow
-from test.support import requires
 
 class Editor_func_test(unittest.TestCase):
     def test_filename_to_unicode(self):
diff --git a/Lib/idlelib/idle_test/test_searchbase.py b/Lib/idlelib/idle_test/test_searchbase.py
index d769fa2fc2f0de..27b02fbe54602c 100644
--- a/Lib/idlelib/idle_test/test_searchbase.py
+++ b/Lib/idlelib/idle_test/test_searchbase.py
@@ -5,7 +5,7 @@
 '''
 import unittest
 from test.support import requires
-from tkinter import Tk, Toplevel, Frame ##, BooleanVar, StringVar
+from tkinter import Tk, Frame  ##, BooleanVar, StringVar
 from idlelib import searchengine as se
 from idlelib import searchbase as sdb
 from idlelib.idle_test.mock_idle import Func

From 0b90939622aeae680c05e7d51092cc167492e4a4 Mon Sep 17 00:00:00 2001
From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sun, 11 Jun 2017 05:28:14 -0400
Subject: [PATCH 2/2] add editor, query

---
 Lib/idlelib/editor.py | 1 -
 Lib/idlelib/query.py  | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Lib/idlelib/editor.py b/Lib/idlelib/editor.py
index ae475cb9f9a6a5..ab4f1a37c168c1 100644
--- a/Lib/idlelib/editor.py
+++ b/Lib/idlelib/editor.py
@@ -26,7 +26,6 @@
 from idlelib import query
 from idlelib import replace
 from idlelib import search
-from idlelib import textview
 from idlelib import windows
 
 # The default tab setting for a Text widget, in average-width characters.
diff --git a/Lib/idlelib/query.py b/Lib/idlelib/query.py
index 3b1f1e25be7f86..593506383c41ab 100644
--- a/Lib/idlelib/query.py
+++ b/Lib/idlelib/query.py
@@ -24,7 +24,7 @@
 import os
 from sys import executable, platform  # Platform is set for one test.
 
-from tkinter import Toplevel, StringVar, W, E, N, S
+from tkinter import Toplevel, StringVar, W, E, S
 from tkinter.ttk import Frame, Button, Entry, Label
 from tkinter import filedialog
 from tkinter.font import Font