[Python-checkins] r69462 - in python/branches/release26-maint: Lib/lib-tk/Tkinter.py Misc/NEWS

[guilherme.polo]

Author: guilherme.polo
Date: Mon Feb  9 17:43:02 2009
New Revision: 69462

Log:
Merged revisions 69461 via svnmerge from 
svn+ssh://pythondev/python/trunk

........
  r69461 | guilherme.polo | 2009-02-09 14:41:09 -0200 (Mon, 09 Feb 2009) | 3 lines
  
  Fixed issue #4890: Handle empty text search pattern in 
  Tkinter.Text.search
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Lib/lib-tk/Tkinter.py
   python/branches/release26-maint/Misc/NEWS

Modified: python/branches/release26-maint/Lib/lib-tk/Tkinter.py
==============================================================================
--- python/branches/release26-maint/Lib/lib-tk/Tkinter.py	(original)
+++ python/branches/release26-maint/Lib/lib-tk/Tkinter.py	Mon Feb  9 17:43:02 2009
@@ -3032,7 +3032,8 @@
            forwards=None, backwards=None, exact=None,
            regexp=None, nocase=None, count=None, elide=None):
         """Search PATTERN beginning from INDEX until STOPINDEX.
-        Return the index of the first character of a match or an empty string."""
+        Return the index of the first character of a match or an
+        empty string."""
         args = [self._w, 'search']
         if forwards: args.append('-forwards')
         if backwards: args.append('-backwards')
@@ -3041,7 +3042,7 @@
         if nocase: args.append('-nocase')
         if elide: args.append('-elide')
         if count: args.append('-count'); args.append(count)
-        if pattern[0] == '-': args.append('--')
+        if pattern and pattern[0] == '-': args.append('--')
         args.append(pattern)
         args.append(index)
         if stopindex: args.append(stopindex)

Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Mon Feb  9 17:43:02 2009
@@ -80,6 +80,8 @@
 Library
 -------
 
+- Issue #4890: Handle empty text search pattern in Tkinter.Text.search.
+
 - Issue #5170: Fixed Unicode output bug in logging and added test case.
   This is a regression which did not occur in 2.5.