[Python-checkins] r65972 - python/branches/release25-maint/Lib/lib-tk/Tkinter.py

[robert.schuppenies]

Author: robert.schuppenies
Date: Fri Aug 22 10:20:35 2008
New Revision: 65972

Log:
Issue #1342811: Fixed broken patch.

Backport from trunk r65971.


Modified:
   python/branches/release25-maint/Lib/lib-tk/Tkinter.py

Modified: python/branches/release25-maint/Lib/lib-tk/Tkinter.py
==============================================================================
--- python/branches/release25-maint/Lib/lib-tk/Tkinter.py	(original)
+++ python/branches/release25-maint/Lib/lib-tk/Tkinter.py	Fri Aug 22 10:20:35 2008
@@ -2672,11 +2672,13 @@
         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)