summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2008-11-19 09:09:41 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2008-11-19 09:09:41 (GMT)
commitbb9b1f1d4a3f1c246aa5cb83cf96a33f13e66427 (patch)
tree5b359656d68f248c8a1e9ae5d7a72055fe1e6584
parent65e8fc7fc13dfb1953fa968cdf2bce49311d2143 (diff)
downloadcpython-bb9b1f1d4a3f1c246aa5cb83cf96a33f13e66427.zip
cpython-bb9b1f1d4a3f1c246aa5cb83cf96a33f13e66427.tar.gz
cpython-bb9b1f1d4a3f1c246aa5cb83cf96a33f13e66427.tar.bz2
Issue #4116: Resolve member name conflict in ScrolledCanvas.__init__
-rw-r--r--Lib/lib-tk/turtle.py4
-rw-r--r--Misc/NEWS2
2 files changed, 4 insertions, 2 deletions
diff --git a/Lib/lib-tk/turtle.py b/Lib/lib-tk/turtle.py
index 001b210..9298c10 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 d84ec84..1214959 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.