[Python-checkins] cpython: Issue #22053: Make help work, after previous patch for this issue disabled it

[terry.reedy]

http://hg.python.org/cpython/rev/8c972d528f06
changeset:   91844:8c972d528f06
parent:      91841:0ca9e0aa06df
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Fri Jul 25 02:26:40 2014 -0400
summary:
  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.

files:
  Lib/turtledemo/__main__.py |  3 ++-
  1 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/Lib/turtledemo/__main__.py b/Lib/turtledemo/__main__.py
--- a/Lib/turtledemo/__main__.py
+++ b/Lib/turtledemo/__main__.py
@@ -121,7 +121,7 @@
         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 @@
 
 
 def main():
+    global demo
     demo = DemoWindow()
     demo.root.mainloop()
 

-- 
Repository URL: http://hg.python.org/cpython