summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2008-11-19 09:14:30 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2008-11-19 09:14:30 (GMT)
commit22d297be51567eb193e792a0da52b93e9a45b9a4 (patch)
treede1edf99013f7eb052de1b0ea813f482440a5ea9
parentd6695ee12a7fd258480d41fe5bd4199c4ee1afb7 (diff)
downloadcpython-22d297be51567eb193e792a0da52b93e9a45b9a4.zip
cpython-22d297be51567eb193e792a0da52b93e9a45b9a4.tar.gz
cpython-22d297be51567eb193e792a0da52b93e9a45b9a4.tar.bz2
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__ ........
-rw-r--r--Lib/turtle.py4
-rw-r--r--Misc/NEWS2
2 files changed, 4 insertions, 2 deletions
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 @@ 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"
@@ -377,7 +377,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 45e965b..9882957 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -33,6 +33,8 @@ Core and Builtins
Library
-------
+- Issue #4116: Resolve member name conflict in ScrolledCanvas.__init__.
+
- Issue #4307: The named tuple that ``inspect.getfullargspec()`` returns now
uses ``kwonlydefaults`` instead of ``kwdefaults``.