From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Fri, 25 Jul 2014 06:26:40 +0000 (-0400)
Subject: Issue #22053: Make help work, after previous patch for this issue disabled it
X-Git-Tag: v3.5.0a1~1207
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=99d67fe7d884d8ccbbffe3e0fc482d6f906df135;p=python

Issue #22053: Make help work, after previous patch for this issue disabled it
by removing global 'demo'. Simple fix because 2.7/3.4 fix cannot merge.
---

diff --git a/Lib/turtledemo/__main__.py b/Lib/turtledemo/__main__.py
index f7eac9a107..11cee04b95 100755
--- a/Lib/turtledemo/__main__.py
+++ b/Lib/turtledemo/__main__.py
@@ -121,7 +121,7 @@ class DemoWindow(object):
         self.mBar = Frame(root, relief=RAISED, borderwidth=2)
         self.ExamplesBtn = self.makeLoadDemoMenu()
         self.OptionsBtn = self.makeHelpMenu()
-        self.mBar.tk_menuBar(self.ExamplesBtn, self.OptionsBtn)
+        #self.mBar.tk_menuBar(self.ExamplesBtn, self.OptionsBtn)
         self.mBar.grid(row=0, columnspan=4, sticky='news')
 
         pane = PanedWindow(orient=HORIZONTAL, sashwidth=5,
@@ -321,6 +321,7 @@ class DemoWindow(object):
 
 
 def main():
+    global demo
     demo = DemoWindow()
     demo.root.mainloop()