]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Issue #4116: Resolve member name conflict in ScrolledCanvas.__init__
authorMartin v. Löwis <martin@v.loewis.de>
Wed, 19 Nov 2008 09:09:41 +0000 (09:09 +0000)
committerMartin v. Löwis <martin@v.loewis.de>
Wed, 19 Nov 2008 09:09:41 +0000 (09:09 +0000)
Lib/lib-tk/turtle.py
Misc/NEWS

index 001b210f98c2e37a062c9c40eb360e47178f00ce..9298c106af0c629984b72812c31de718de8a13f5 100644 (file)
@@ -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."""
index d84ec8494e23ce980567e29e92598b647cd395e5..12149599575e1dddee1ab4b91dc229c812bc182e 100644 (file)
--- 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.