[Python-3000-checkins] r65973 - in python/branches/py3k: Lib/tkinter/__init__.py

[robert.schuppenies]

Author: robert.schuppenies
Date: Fri Aug 22 10:27:53 2008
New Revision: 65973

Log:
Merged revisions 65971 via svnmerge from
svn+ssh://pythondev at 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.
........


Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Lib/tkinter/__init__.py

Modified: python/branches/py3k/Lib/tkinter/__init__.py
==============================================================================
--- python/branches/py3k/Lib/tkinter/__init__.py (original)
+++ python/branches/py3k/Lib/tkinter/__init__.py Fri Aug 22 10:27:53 2008
@@ -2654,11 +2654,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)