ttk: fix LabeledScale and OptionMenu destroy() method (#3025) (#3030)

bpo-31135: Call the parent destroy() method even if the used
attribute doesn't exist.

The LabeledScale.destroy() method now also explicitly clears label
and scale attributes to help the garbage collector to destroy all
widgets.
(cherry picked from commit cd7e9c1b67)
This commit is contained in:
Victor Stinner 2017-08-09 10:48:11 +02:00 committed by GitHub
parent e93135dbb2
commit 33460fa7e0
2 changed files with 12 additions and 4 deletions

View File

@ -1543,11 +1543,12 @@ class LabeledScale(Frame):
try:
self._variable.trace_vdelete('w', self.__tracecb)
except AttributeError:
# widget has been destroyed already
pass
else:
del self._variable
Frame.destroy(self)
super().destroy()
self.label = None
self.scale = None
def _adjust(self, *args):
@ -1647,5 +1648,8 @@ class OptionMenu(Menubutton):
def destroy(self):
"""Destroy this widget and its associated variable."""
del self._variable
Menubutton.destroy(self)
try:
del self._variable
except AttributeError:
pass
super().destroy()

View File

@ -0,0 +1,4 @@
ttk: fix the destroy() method of LabeledScale and OptionMenu classes.
Call the parent destroy() method even if the used attribute doesn't
exist. The LabeledScale.destroy() method now also explicitly clears label and
scale attributes to help the garbage collector to destroy all widgets.