Merge with 3.4

This commit is contained in:
Terry Jan Reedy 2014-06-07 04:28:16 -04:00
commit 7244d775db
1 changed files with 10 additions and 3 deletions

View File

@ -5,7 +5,6 @@ from tkinter import Tk, Text, TclError
import idlelib.AutoComplete as ac import idlelib.AutoComplete as ac
import idlelib.AutoCompleteWindow as acw import idlelib.AutoCompleteWindow as acw
import idlelib.macosxSupport as mac import idlelib.macosxSupport as mac
from idlelib.EditorWindow import EditorWindow
from idlelib.idle_test.mock_idle import Func from idlelib.idle_test.mock_idle import Func
from idlelib.idle_test.mock_tk import Event from idlelib.idle_test.mock_tk import Event
@ -13,6 +12,14 @@ class AutoCompleteWindow:
def complete(): def complete():
return return
class DummyEditwin:
def __init__(self, root, text):
self.root = root
self.text = text
self.indentwidth = 8
self.tabwidth = 8
self.context_use_ps1 = True
class AutoCompleteTest(unittest.TestCase): class AutoCompleteTest(unittest.TestCase):
@ -21,8 +28,8 @@ class AutoCompleteTest(unittest.TestCase):
requires('gui') requires('gui')
cls.root = Tk() cls.root = Tk()
mac.setupApp(cls.root, None) mac.setupApp(cls.root, None)
cls.editor = EditorWindow(root=cls.root) cls.text = Text(cls.root)
cls.text = cls.editor.text cls.editor = DummyEditwin(cls.root, cls.text)
@classmethod @classmethod
def tearDownClass(cls): def tearDownClass(cls):