[Python-3000-checkins] r67281 - in python/branches/py3k: Lib/turtle.py Misc/NEWS

martin.v.loewis python-3000-checkins at python.org
Wed Nov 19 10:14:31 CET 2008


Author: martin.v.loewis
Date: Wed Nov 19 10:14:30 2008
New Revision: 67281

Log:
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__
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/turtle.py
   python/branches/py3k/Misc/NEWS

Modified: python/branches/py3k/Lib/turtle.py
==============================================================================
--- python/branches/py3k/Lib/turtle.py	(original)
+++ python/branches/py3k/Lib/turtle.py	Wed Nov 19 10:14:30 2008
@@ -357,7 +357,7 @@
     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 @@
         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."""

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Wed Nov 19 10:14:30 2008
@@ -33,6 +33,8 @@
 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``.
 


More information about the Python-3000-checkins mailing list