[Python-checkins] r75116 - in python/branches/release26-maint: Demo/turtle/turtleDemo.py Lib/lib-tk/turtle.py

Mon Sep 28 20:45:13 CEST 2009

Author: r.david.murray
Date: Mon Sep 28 20:45:13 2009
New Revision: 75116
Log:
Merged revisions 75115 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk
........
 r75115 | r.david.murray | 2009年09月28日 14:29:28 -0400 (2009年9月28日) | 2 lines
 
 Applying patches backported from 3.1, by Gregor Lingl.
........
Modified:
 python/branches/release26-maint/ (props changed)
 python/branches/release26-maint/Demo/turtle/turtleDemo.py
 python/branches/release26-maint/Lib/lib-tk/turtle.py
Modified: python/branches/release26-maint/Demo/turtle/turtleDemo.py
==============================================================================

--- python/branches/release26-maint/Demo/turtle/turtleDemo.py	(original)
+++ python/branches/release26-maint/Demo/turtle/turtleDemo.py	Mon Sep 28 20:45:13 2009
@@ -98,6 +98,7 @@
 turtle._Screen._canvas = turtle.ScrolledCanvas(g_frame, 800, 600, 1000, 800)
 #xturtle.Screen._canvas.pack(expand=1, fill="both")
 self.screen = _s_ = turtle.Screen()
+ turtle.TurtleScreen.__init__(_s_, _s_._canvas)
 self.scanvas = _s_._canvas
 #xturtle.RawTurtle.canvases = [self.scanvas]
 turtle.RawTurtle.screens = [_s_]
Modified: python/branches/release26-maint/Lib/lib-tk/turtle.py
==============================================================================
--- python/branches/release26-maint/Lib/lib-tk/turtle.py	(original)
+++ python/branches/release26-maint/Lib/lib-tk/turtle.py	Mon Sep 28 20:45:13 2009
@@ -1,8 +1,8 @@
 #
 # turtle.py: a Tkinter based turtle graphics module for Python
-# Version 1.0b1 - 31. 5. 2008
+# Version 1.0.1 - 24. 9. 2009
 #
-# Copyright (C) 2006 - 2008 Gregor Lingl
+# Copyright (C) 2006 - 2009 Gregor Lingl
 # email: glingl at aon.at
 #
 # This software is provided 'as-is', without any express or implied
@@ -1244,9 +1244,12 @@
 def update(self):
 """Perform a TurtleScreen update.
 """
+ tracing = self._tracing
+ self._tracing = True
 for t in self.turtles():
 t._update_data()
 t._drawturtle()
+ self._tracing = tracing
 self._update()
 
 def window_width(self):
@@ -1337,7 +1340,8 @@
 ### consequently drawing a hexagon
 """
 if fun == None:
- self._keys.remove(key)
+ if key in self._keys:
+ self._keys.remove(key)
 elif key not in self._keys:
 self._keys.append(key)
 self._onkey(fun, key)
@@ -3574,8 +3578,8 @@
 topbottom = _CFG["topbottom"]
 self._root.setupcanvas(width, height, canvwidth, canvheight)
 _Screen._canvas = self._root._getcanvas()
+ TurtleScreen.__init__(self, _Screen._canvas)
 self.setup(width, height, leftright, topbottom)
- TurtleScreen.__init__(self, _Screen._canvas)
 
 def setup(self, width=_CFG["width"], height=_CFG["height"],
 startx=_CFG["leftright"], starty=_CFG["topbottom"]):
@@ -3615,6 +3619,7 @@
 if starty is None:
 starty = (sh - height) / 2
 self._root.set_geometry(width, height, startx, starty)
+ self.update()
 
 def title(self, titlestring):
 """Set title of turtle-window
