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/lib-tk/turtle.py b/Lib/lib-tk/turtle.py
index 001b210f98c2e37a062c9c40eb360e47178f00ce..9298c106af0c629984b72812c31de718de8a13f5 100644 (file)
--- 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 8ab8937f99654638c9bb9ee615cbc6de7e11afde..f04655962b40656931a39b7b9c29a1f9c328a0d8 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__.
+
 - Issue #3774: Fixed an error when create a Tkinter menu item without command
   and then remove it.