Merge 3.4 #23184: idle tests, remove unused names and imports.

This commit is contained in:
Terry Jan Reedy 2015-05-15 23:55:49 -04:00
commit 188c18d48f
5 changed files with 7 additions and 8 deletions

View File

@ -1,6 +1,6 @@
import unittest
from test.support import requires
from tkinter import Tk, Text, TclError
from tkinter import Tk, Text
import idlelib.AutoComplete as ac
import idlelib.AutoCompleteWindow as acw
@ -95,8 +95,8 @@ class AutoCompleteTest(unittest.TestCase):
del ev.mc_state
# If autocomplete window is open, complete() method is called
testwin = self.autocomplete._make_autocomplete_window()
self.text.insert('1.0', 're.')
# This must call autocomplete._make_autocomplete_window()
Equal(self.autocomplete.autocomplete_event(ev), 'break')
# If autocomplete window is not active or does not exist,

View File

@ -2,7 +2,7 @@
import unittest
from idlelib import FormatParagraph as fp
from idlelib.EditorWindow import EditorWindow
from tkinter import Tk, Text, TclError
from tkinter import Tk, Text
from test.support import requires

View File

@ -6,13 +6,13 @@ testing skipping of suite when self.needwrapbutton is false.
'''
import unittest
from test.support import requires
from tkinter import Tk, Toplevel, Frame, Label, BooleanVar, StringVar
from tkinter import Tk, Toplevel, Frame ##, BooleanVar, StringVar
from idlelib import SearchEngine as se
from idlelib import SearchDialogBase as sdb
from idlelib.idle_test.mock_idle import Func
from idlelib.idle_test.mock_tk import Var, Mbox
## from idlelib.idle_test.mock_tk import Var
# The following could help make some tests gui-free.
# The ## imports above & following could help make some tests gui-free.
# However, they currently make radiobutton tests fail.
##def setUpModule():
## # Replace tk objects used to initialize se.SearchEngine.

View File

@ -7,7 +7,7 @@
import re
import unittest
from test.support import requires
# from test.support import requires
from tkinter import BooleanVar, StringVar, TclError # ,Tk, Text
import tkinter.messagebox as tkMessageBox
from idlelib import SearchEngine as se

View File

@ -3,7 +3,6 @@ import unittest
from test.support import requires
from _tkinter import TclError
import tkinter as tk
class TextTest(object):