summaryrefslogtreecommitdiffstats
path: root/Lib/lib-tk
diff options
context:
space:
mode:
authorRobert Schuppenies <okkotonushi@googlemail.com>2008-08-22 08:03:43 (GMT)
committerRobert Schuppenies <okkotonushi@googlemail.com>2008-08-22 08:03:43 (GMT)
commitaf1aae3aa6ea11b39a9fe24ddcaf9caaa537261b (patch)
treebb7c332791f03081e06548e5cb0008746b841741 /Lib/lib-tk
parent5c2bb1a7d43b630efa9e12959d129a56bc7b615e (diff)
downloadcpython-af1aae3aa6ea11b39a9fe24ddcaf9caaa537261b.zip
cpython-af1aae3aa6ea11b39a9fe24ddcaf9caaa537261b.tar.gz
cpython-af1aae3aa6ea11b39a9fe24ddcaf9caaa537261b.tar.bz2
Issue #1342811: Fixed broken patch. Reviewed by benjamin.peterson.
Diffstat (limited to 'Lib/lib-tk')
-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 00ee2c8..9533f8c 100644
--- a/Lib/lib-tk/Tkinter.py
+++ b/Lib/lib-tk/Tkinter.py
@@ -2662,11 +2662,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)