[Python-checkins] cpython (merge 3.4 -> default): Merge with 3.4

[terry.reedy]

http://hg.python.org/cpython/rev/6d8e01f2169c
changeset:   92250:6d8e01f2169c
parent:      92248:088cfde9af06
parent:      92249:a94d9c981461
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Wed Aug 27 01:58:57 2014 -0400
summary:
  Merge with 3.4

files:
  Lib/turtledemo/__main__.py |  18 ++++++++----------
  1 files changed, 8 insertions(+), 10 deletions(-)


diff --git a/Lib/turtledemo/__main__.py b/Lib/turtledemo/__main__.py
--- a/Lib/turtledemo/__main__.py
+++ b/Lib/turtledemo/__main__.py
@@ -180,7 +180,7 @@
         self.exitflag = False
         if filename:
             self.loadfile(filename)
-        self.configGUI(NORMAL, DISABLED, DISABLED, DISABLED,
+        self.configGUI(DISABLED, DISABLED, DISABLED,
                        "Choose example from menu", "black")
         self.state = STARTUP
 
@@ -225,9 +225,7 @@
         turtle.RawTurtle.screens = [_s_]
         return canvas
 
-    def configGUI(self, menu, start, stop, clear, txt="", color="blue"):
-        self.mBar.entryconfigure(0, state=menu)
-
+    def configGUI(self, start, stop, clear, txt="", color="blue"):
         self.start_btn.config(state=start,
                               bg="#d00" if start == NORMAL else "#fca")
         self.stop_btn.config(state=stop,
@@ -276,7 +274,7 @@
         self.text.insert("1.0", chars)
         self.root.title(filename + " - a Python turtle graphics example")
         reload(self.module)
-        self.configGUI(NORMAL, NORMAL, DISABLED, DISABLED,
+        self.configGUI(NORMAL, DISABLED, DISABLED,
                        "Press start button", "red")
         self.state = READY
 
@@ -284,7 +282,7 @@
         self.refreshCanvas()
         self.dirty = True
         turtle.TurtleScreen._RUNNING = True
-        self.configGUI(DISABLED, DISABLED, NORMAL, DISABLED,
+        self.configGUI(DISABLED, NORMAL, DISABLED,
                        "demo running...", "black")
         self.screen.clear()
         self.screen.mode("standard")
@@ -300,24 +298,24 @@
             self.state = DONE
             result = "stopped!"
         if self.state == DONE:
-            self.configGUI(NORMAL, NORMAL, DISABLED, NORMAL,
+            self.configGUI(NORMAL, DISABLED, NORMAL,
                            result)
         elif self.state == EVENTDRIVEN:
             self.exitflag = True
-            self.configGUI(DISABLED, DISABLED, NORMAL, DISABLED,
+            self.configGUI(DISABLED, NORMAL, DISABLED,
                            "use mouse/keys or STOP", "red")
 
     def clearCanvas(self):
         self.refreshCanvas()
         self.screen._delete("all")
         self.scanvas.config(cursor="")
-        self.configGUI(NORMAL, NORMAL, DISABLED, DISABLED)
+        self.configGUI(NORMAL, DISABLED, DISABLED)
 
     def stopIt(self):
         if self.exitflag:
             self.clearCanvas()
             self.exitflag = False
-            self.configGUI(NORMAL, NORMAL, DISABLED, DISABLED,
+            self.configGUI(NORMAL, DISABLED, DISABLED,
                            "STOPPED!", "red")
         turtle.TurtleScreen._RUNNING = False
 

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