From 22d297be51567eb193e792a0da52b93e9a45b9a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Wed, 19 Nov 2008 09:14:30 +0000 Subject: [PATCH] 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__ ........ --- Lib/turtle.py | 4 ++-- Misc/NEWS | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Lib/turtle.py b/Lib/turtle.py index bcc53ce3dd5..6f733745217 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('', self.onResize) + self._rootwindow.bind('', 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 45e965bc6d1..9882957aac9 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``.