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

[terry.reedy]

http://hg.python.org/cpython/rev/088cfde9af06
changeset:   92248:088cfde9af06
parent:      92246:0337a460f05b
parent:      92247:b671092e08fa
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Wed Aug 27 01:44:13 2014 -0400
summary:
  Merge with 3.4

files:
  Lib/turtledemo/__main__.py |  13 ++++++-------
  Lib/turtledemo/nim.py      |   2 +-
  2 files changed, 7 insertions(+), 8 deletions(-)


diff --git a/Lib/turtledemo/__main__.py b/Lib/turtledemo/__main__.py
--- a/Lib/turtledemo/__main__.py
+++ b/Lib/turtledemo/__main__.py
@@ -260,12 +260,13 @@
         return menu
 
     def refreshCanvas(self):
-        if not self.dirty: return
-        self.screen.clear()
-        self.dirty=False
+        if self.dirty:
+            self.screen.clear()
+            self.dirty=False
 
     def loadfile(self, filename):
-        self.refreshCanvas()
+        self.clearCanvas()
+        turtle.TurtleScreen._RUNNING = False
         modname = 'turtledemo.' + filename
         __import__(modname)
         self.module = sys.modules[modname]
@@ -318,9 +319,7 @@
             self.exitflag = False
             self.configGUI(NORMAL, NORMAL, DISABLED, DISABLED,
                            "STOPPED!", "red")
-            turtle.TurtleScreen._RUNNING = False
-        else:
-            turtle.TurtleScreen._RUNNING = False
+        turtle.TurtleScreen._RUNNING = False
 
     def _destroy(self):
         self.root.destroy()
diff --git a/Lib/turtledemo/nim.py b/Lib/turtledemo/nim.py
--- a/Lib/turtledemo/nim.py
+++ b/Lib/turtledemo/nim.py
@@ -219,7 +219,7 @@
     mainscreen.mode("standard")
     mainscreen.setup(SCREENWIDTH, SCREENHEIGHT)
     nim = Nim(mainscreen)
-    return "EVENTLOOP!"
+    return "EVENTLOOP"
 
 if __name__ == "__main__":
     main()

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