[Python-checkins] r67082 - in python/trunk: Lib/lib-tk/Tkinter.py Misc/NEWS

Mon Nov 3 19:03:07 CET 2008

Author: hirokazu.yamamoto
Date: Mon Nov 3 19:03:06 2008
New Revision: 67082
Log:
Issue #3774: Fixed an error when create a Tkinter menu item without command
and then remove it. Written by Guilherme Polo (gpolo).
Modified:
 python/trunk/Lib/lib-tk/Tkinter.py
 python/trunk/Misc/NEWS
Modified: python/trunk/Lib/lib-tk/Tkinter.py
==============================================================================

--- python/trunk/Lib/lib-tk/Tkinter.py	(original)
+++ python/trunk/Lib/lib-tk/Tkinter.py	Mon Nov 3 19:03:06 2008
@@ -1921,6 +1921,8 @@
 cnf = _cnfmerge((cnf, kw))
 self.widgetName = widgetName
 BaseWidget._setup(self, master, cnf)
+ if self._tclCommands is None:
+ self._tclCommands = []
 classes = []
 for k in cnf.keys():
 if type(k) is ClassType:
@@ -2658,20 +2660,20 @@
 """Add separator at INDEX."""
 self.insert(index, 'separator', cnf or kw)
 def delete(self, index1, index2=None):
- """Delete menu items between INDEX1 and INDEX2 (not included)."""
+ """Delete menu items between INDEX1 and INDEX2 (included)."""
 if index2 is None:
 index2 = index1
- cmds = []
- (num_index1, num_index2) = (self.index(index1), self.index(index2))
- if (num_index1 is not None) and (num_index2 is not None):
- for i in range(num_index1, num_index2 + 1):
- if 'command' in self.entryconfig(i):
- c = str(self.entrycget(i, 'command'))
- if c in self._tclCommands:
- cmds.append(c)
+
+ num_index1, num_index2 = self.index(index1), self.index(index2)
+ if (num_index1 is None) or (num_index2 is None):
+ num_index1, num_index2 = 0, -1
+
+ for i in range(num_index1, num_index2 + 1):
+ if 'command' in self.entryconfig(i):
+ c = str(self.entrycget(i, 'command'))
+ if c:
+ self.deletecommand(c)
 self.tk.call(self._w, 'delete', index1, index2)
- for c in cmds:
- self.deletecommand(c)
 def entrycget(self, index, option):
 """Return the resource value of an menu item for OPTION at INDEX."""
 return self.tk.call(self._w, 'entrycget', index, '-' + option)
Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Mon Nov 3 19:03:06 2008
@@ -38,6 +38,9 @@
 Library
 -------
 
+- Issue #3774: Fixed an error when create a Tkinter menu item without command
+ and then remove it.
+
 - Fixed a modulefinder crash on certain relative imports.
 
 - Issue #4150: Pdb's "up" command now works for generator frames in post-mortem
