summaryrefslogtreecommitdiff
path: root/Lib/lib-tk/Tkinter.py
diff options
context:
space:
mode:
authorRobert Schuppenies <okkotonushi@googlemail.com>2008-08-22 08:20:35 +0000
committerRobert Schuppenies <okkotonushi@googlemail.com>2008-08-22 08:20:35 +0000
commit8a8bfa0bc749f3c27e98b655f33a2b4237a637a8 (patch)
tree98fa0a98f220fdbeeb3d10c6f361227e95b5bf53 /Lib/lib-tk/Tkinter.py
parent4806404ecc87a285cd12ea80bc0b41fc0795b637 (diff)
downloadcpython-git-8a8bfa0bc749f3c27e98b655f33a2b4237a637a8.tar.gz
Issue #1342811: Fixed broken patch.
Backport from trunk r65971.
Diffstat (limited to 'Lib/lib-tk/Tkinter.py')
-rw-r--r--Lib/lib-tk/Tkinter.py12
1 files changed, 7 insertions, 5 deletions
diff --git a/Lib/lib-tk/Tkinter.py b/Lib/lib-tk/Tkinter.py
index 8874f02daa..d714a908a3 100644
--- a/Lib/lib-tk/Tkinter.py
+++ b/Lib/lib-tk/Tkinter.py
@@ -2672,11 +2672,13 @@ class Menu(Widget):
if index2 is None:
index2 = index1
cmds = []
- for i in range(self.index(index1), self.index(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 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)
self.tk.call(self._w, 'delete', index1, index2)
for c in cmds:
self.deletecommand(c)