traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge heads

This commit is contained in:
Terry Jan Reedy 2014-05-19 22:54:58 -04:00
parent 2a54582d72 ab4fd4448a
commit b7b56e9110
2 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Lib/idlelib/EditorWindow.py
View File

@ -79,7 +79,7 @@ class HelpDialog(object):
self.parent = None self.parent = None
helpDialog = HelpDialog() # singleton instance helpDialog = HelpDialog() # singleton instance
def _Help_dialog(parent): # wrapper for htest def _help_dialog(parent): # wrapper for htest
helpDialog.show_dialog(parent) helpDialog.show_dialog(parent)
@ -1702,21 +1702,21 @@ def fixwordbreaks(root):
tk.call('set', 'tcl_nonwordchars', '[^a-zA-Z0-9_]') tk.call('set', 'tcl_nonwordchars', '[^a-zA-Z0-9_]')
def _Editor_window(parent): def _editor_window(parent):
root = parent root = parent
fixwordbreaks(root) fixwordbreaks(root)
root.withdraw() ## root.withdraw()
if sys.argv[1:]: if sys.argv[1:]:
filename = sys.argv[1] filename = sys.argv[1]
else: else:
filename = None filename = None
macosxSupport.setupApp(root, None) macosxSupport.setupApp(root, None)
edit = EditorWindow(root=root, filename=filename) edit = EditorWindow(root=root, filename=filename)
edit.set_close_hook(root.quit) ## edit.set_close_hook(root.quit)
edit.text.bind("<<close-all-windows>>", edit.close_event) ## edit.text.bind("<<close-all-windows>>", edit.close_event)
if __name__ == '__main__': if __name__ == '__main__':
from idlelib.idle_test.htest import run from idlelib.idle_test.htest import run
if len(sys.argv) <= 1: if len(sys.argv) <= 1:
run(_Help_dialog) run(_help_dialog)
run(_Editor_window) run(_editor_window)

39
Lib/idlelib/idle_test/htest.py
View File

@ -13,10 +13,10 @@ if __name__ == '__main__':
The X object must have a .__name__ attribute and a 'parent' parameter. The X object must have a .__name__ attribute and a 'parent' parameter.
X will often be a widget class, but a callable instance with .__name__ X will often be a widget class, but a callable instance with .__name__
or a wrapper function also work. The name of wrapper functions, like or a wrapper function also work. The name of wrapper functions, like
'_Editor_Window', should start with '_'. '_editor_Window', should start with '_'.
This file must contain a matching instance of the folling template, This file must contain a matching instance of the folling template,
with X.__name__ prepended, as in '_Editor_window_spec ...'. with X.__name__ prepended, as in '_editor_window_spec ...'.
_spec = { _spec = {
'file': '', 'file': '',
@ -33,19 +33,6 @@ msg: displayed in a master window. Hints as to how the user might
from importlib import import_module from importlib import import_module
import tkinter as tk import tkinter as tk
_Editor_window_spec = {
'file': 'EditorWindow',
'kwds': {},
'msg': "Test editor functions of interest"
}
_Help_dialog_spec = {
'file': 'EditorWindow',
'kwds': {},
'msg': "If the help text displays, this works"
}
AboutDialog_spec = { AboutDialog_spec = {
'file': 'aboutDialog', 'file': 'aboutDialog',
'kwds': {'title': 'About test'}, 'kwds': {'title': 'About test'},
@ -53,15 +40,27 @@ AboutDialog_spec = {
} }
_editor_window_spec = {
'file': 'EditorWindow',
'kwds': {},
'msg': "Test editor functions of interest"
}
GetCfgSectionNameDialog_spec = { GetCfgSectionNameDialog_spec = {
'file': 'configSectionNameDialog', 'file': 'configSectionNameDialog',
'kwds': {'title':'Get Name', 'kwds': {'title':'Get Name',
'message':'Enter something', 'message':'Enter something',
'used_names': {'abc'}, 'used_names': {'abc'},
'_htest': True}, '_htest': True},
'msg': "After the text entered with [Ok] is stripped, <nothing>, " 'msg': "After the text entered with [Ok] is stripped, <nothing>, "
"'abc', or more that 30 chars are errors.\n" "'abc', or more that 30 chars are errors.\n"
"Close 'Get Name' with a valid entry (printed to Shell), [Cancel], or [X]", "Close 'Get Name' with a valid entry (printed to Shell), [Cancel], or [X]",
}
_help_dialog_spec = {
'file': 'EditorWindow',
'kwds': {},
'msg': "If the help text displays, this works"
} }
def run(test): def run(test):