From: Martin v. Löwis <martin@v.loewis.de>
Date: Wed, 19 Nov 2008 09:09:41 +0000 (+0000)
Subject: Issue #4116: Resolve member name conflict in ScrolledCanvas.__init__
X-Git-Tag: v2.7a1~2651
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb9b1f1d4a3f1c246aa5cb83cf96a33f13e66427;p=thirdparty%2FPython%2Fcpython.git

Issue #4116: Resolve member name conflict in ScrolledCanvas.__init__
---

diff --git a/Lib/lib-tk/turtle.py b/Lib/lib-tk/turtle.py
index 001b210f98c2..9298c106af0c 100644
--- a/Lib/lib-tk/turtle.py
+++ b/Lib/lib-tk/turtle.py
@@ -359,7 +359,7 @@ class ScrolledCanvas(TK.Frame):
     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 @@ class ScrolledCanvas(TK.Frame):
         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."""
diff --git a/Misc/NEWS b/Misc/NEWS
index d84ec8494e23..12149599575e 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -42,6 +42,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #4116: Resolve member name conflict in ScrolledCanvas.__init__.
+
 - httplib.HTTPConnection.putheader() now accepts an arbitrary number of values
   for any header, matching what the documentation has claimed for a while.