changeset: 91844:8c972d528f06
parent: 91841:0ca9e0aa06df
user: Terry Jan Reedy <tjreedy@udel.edu>
date: Fri Jul 25 02:26:40 2014 -0400
files: Lib/turtledemo/__main__.py
description:
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 -r 0ca9e0aa06df -r 8c972d528f06 Lib/turtledemo/__main__.py
--- a/Lib/turtledemo/__main__.py	Fri Jul 25 00:55:23 2014 +0200
+++ b/Lib/turtledemo/__main__.py	Fri Jul 25 02:26:40 2014 -0400
@@ -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()
 
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://hg.python.org/cpython/rev/8c972d528f06">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://hg.python.org/cpython/rev/8c972d528f06" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>