diff options
| author | Terry Jan Reedy <tjreedy@udel.edu> | 2014-08-27 01:44:13 -0400 |
|---|---|---|
| committer | Terry Jan Reedy <tjreedy@udel.edu> | 2014-08-27 01:44:13 -0400 |
| commit | dfb110d8a3e9bb4a1f932e8e52a3ce8765c86cef (patch) | |
| tree | 137a7f58f46b562537806de366fbd89052e62e0b | |
| parent | fc452518e62a0635a98517f71dccd256e202e433 (diff) | |
| parent | 8450c5331548e396d31639776c91e191a5f3147e (diff) | |
| download | cpython-git-dfb110d8a3e9bb4a1f932e8e52a3ce8765c86cef.tar.gz | |
Merge with 3.4
| -rwxr-xr-x | Lib/turtledemo/__main__.py | 13 | ||||
| -rw-r--r-- | Lib/turtledemo/nim.py | 2 |
2 files changed, 7 insertions, 8 deletions
diff --git a/Lib/turtledemo/__main__.py b/Lib/turtledemo/__main__.py index d64f887c58..586b2a8662 100755 --- a/Lib/turtledemo/__main__.py +++ b/Lib/turtledemo/__main__.py @@ -260,12 +260,13 @@ class DemoWindow(object): 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 @@ class DemoWindow(object): 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 index 25ff3128f6..9ae6cc5c01 100644 --- a/Lib/turtledemo/nim.py +++ b/Lib/turtledemo/nim.py @@ -219,7 +219,7 @@ def main(): mainscreen.mode("standard") mainscreen.setup(SCREENWIDTH, SCREENHEIGHT) nim = Nim(mainscreen) - return "EVENTLOOP!" + return "EVENTLOOP" if __name__ == "__main__": main() |