From: Robert Schuppenies <okkotonushi@googlemail.com>
Date: Fri, 22 Aug 2008 08:20:35 +0000 (+0000)
Subject: Issue #1342811: Fixed broken patch.
X-Git-Tag: v2.5.3c1~53
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8a8bfa0bc749f3c27e98b655f33a2b4237a637a8;p=python

Issue #1342811: Fixed broken patch.

Backport from trunk r65971.
---

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)