diff options
author | Terry Jan Reedy <tjreedy@udel.edu> | 2014-07-25 06:26:40 (GMT) |
---|---|---|
committer | Terry Jan Reedy <tjreedy@udel.edu> | 2014-07-25 06:26:40 (GMT) |
commit | 99d67fe7d884d8ccbbffe3e0fc482d6f906df135 (patch) | |
tree | b1e3083daa233cf97e6eed304301b36654cc73bf | |
parent | 3953398363f687f27d551b46f7ce9371727a5c71 (diff) | |
download | cpython-99d67fe7d884d8ccbbffe3e0fc482d6f906df135.zip cpython-99d67fe7d884d8ccbbffe3e0fc482d6f906df135.tar.gz cpython-99d67fe7d884d8ccbbffe3e0fc482d6f906df135.tar.bz2 |
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.
-rwxr-xr-x | Lib/turtledemo/__main__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/turtledemo/__main__.py b/Lib/turtledemo/__main__.py index f7eac9a..11cee04 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() |