Issue #22053: Make help work, after previous patch for this issue disabled it

by removing global 'demo'. Refactor and remove duplicate code.
This commit is contained in:
Terry Jan Reedy 2014-07-25 01:56:24 -04:00
parent fea6a100dc
commit 280aace067
1 changed files with 9 additions and 17 deletions

View File

@ -27,17 +27,11 @@ def getExampleEntries():
return [entry[:-3] for entry in os.listdir(demo_dir) if
entry.endswith(".py") and entry[0] != '_']
def showDemoHelp():
view_file(demo.root, "Help on turtleDemo",
os.path.join(demo_dir, "demohelp.txt"))
def showAboutDemo():
view_file(demo.root, "About turtleDemo",
os.path.join(demo_dir, "about_turtledemo.txt"))
def showAboutTurtle():
view_file(demo.root, "About the new turtle module.",
os.path.join(demo_dir, "about_turtle.txt"))
help_entries = ( # (help_label, help_file)
('Turtledemo help', "demohelp.txt"),
('About turtledemo', "about_turtledemo.txt"),
('About turtle module', "about_turtle.txt"),
)
class DemoWindow(object):
@ -177,12 +171,10 @@ class DemoWindow(object):
CmdBtn.pack(side=LEFT, padx='2m')
CmdBtn.menu = Menu(CmdBtn)
CmdBtn.menu.add_command(label='About turtle.py', font=menufont,
command=showAboutTurtle)
CmdBtn.menu.add_command(label='turtleDemo - Help', font=menufont,
command=showDemoHelp)
CmdBtn.menu.add_command(label='About turtleDemo', font=menufont,
command=showAboutDemo)
for help_label, help_file in help_entries:
def show(help_label=help_label, help_file=help_file):
view_file(self.root, help_label, os.path.join(demo_dir, help_file))
CmdBtn.menu.add_command(label=help_label, font=menufont, command=show)
CmdBtn['menu'] = CmdBtn.menu
return CmdBtn