From: Robert Schuppenies <okkotonushi@googlemail.com>
Date: Fri, 22 Aug 2008 08:27:53 +0000 (+0000)
Subject: Merged revisions 65971 via svnmerge from
X-Git-Tag: v3.0rc1~194
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ffeef9044e88b7189ddd358c803b8f682206ceaa;p=python

Merged revisions 65971 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r65971 | robert.schuppenies | 2008-08-22 10:03:43 +0200 (Fri, 22 Aug 2008) | 2 lines

  Issue #1342811: Fixed broken patch. Reviewed by benjamin.peterson.
........
---

diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py
index b8508a568a..faca78ff3e 100644
--- a/Lib/tkinter/__init__.py
+++ b/Lib/tkinter/__init__.py
@@ -2654,11 +2654,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)