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__
........
diff --git a/Lib/turtle.py b/Lib/turtle.py
index bcc53ce..6f73374 100644
--- a/Lib/turtle.py
+++ b/Lib/turtle.py
@@ -357,7 +357,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"
@@ -377,7 +377,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."""