[Python-checkins] r67280 - in python/branches/release26-maint: Lib/lib-tk/turtle.py Misc/NEWS

[martin.v.loewis]

Author: martin.v.loewis
Date: Wed Nov 19 10:11:49 2008
New Revision: 67280

Log:
Merged revisions 67279 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r67279 | martin.v.loewis | 2008-11-19 10:09:41 +0100 (Mi, 19 Nov 2008) | 2 lines
  
  Issue #4116: Resolve member name conflict in ScrolledCanvas.__init__
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Lib/lib-tk/turtle.py
   python/branches/release26-maint/Misc/NEWS

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	Wed Nov 19 10:11:49 2008
@@ -359,7 +359,7 @@
     def __init__(self, master, width=500, height=350,
                                           canvwidth=600, canvheight=500):
         TK.Frame.__init__(self, master, width=width, height=height)
-        self._root = self.winfo_toplevel()
+        self._rootwindow = self.winfo_toplevel()
         self.width, self.height = width, height
         self.canvwidth, self.canvheight = canvwidth, canvheight
         self.bg = "white"
@@ -379,7 +379,7 @@
         self.hscroll.grid(padx=1, in_ = self, pady=1, row=1,
                 column=0, rowspan=1, columnspan=1, sticky='news')
         self.reset()
-        self._root.bind('<Configure>', self.onResize)
+        self._rootwindow.bind('<Configure>', self.onResize)
 
     def reset(self, canvwidth=None, canvheight=None, bg = None):
         """Ajust canvas and scrollbars according to given canvas size."""

Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Wed Nov 19 10:11:49 2008
@@ -42,6 +42,8 @@
 Library
 -------
 
+- Issue #4116: Resolve member name conflict in ScrolledCanvas.__init__.
+
 - Issue #3774: Fixed an error when create a Tkinter menu item without command
   and then remove it.