cpython: 2a56eb5c08cc (original) (raw)

Mercurial > cpython

changeset 96074:2a56eb5c08cc

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

line wrap: on

line diff

--- a/Lib/idlelib/idle_test/test_autocomplete.py +++ b/Lib/idlelib/idle_test/test_autocomplete.py @@ -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()[](#l1.15)
     self.text.insert('1.0', 're.')[](#l1.16)

•    # This must call autocomplete._make_autocomplete_window()[](#l1.17)
     Equal(self.autocomplete.autocomplete_event(ev), 'break')[](#l1.18)

# If autocomplete window is not active or does not exist,

--- a/Lib/idlelib/idle_test/test_formatparagraph.py +++ b/Lib/idlelib/idle_test/test_formatparagraph.py @@ -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

--- a/Lib/idlelib/idle_test/test_searchdialogbase.py +++ b/Lib/idlelib/idle_test/test_searchdialogbase.py @@ -6,13 +6,13 @@ testing skipping of suite when self.need ''' 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.

--- a/Lib/idlelib/idle_test/test_searchengine.py +++ b/Lib/idlelib/idle_test/test_searchengine.py @@ -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

--- a/Lib/idlelib/idle_test/test_text.py +++ b/Lib/idlelib/idle_test/test_text.py @@ -3,7 +3,6 @@ import unittest from test.support import requires from _tkinter import TclError -import tkinter as tk class TextTest(object):