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
........
This commit is contained in:
Guilherme Polo 2009-02-09 16:43:02 +00:00
parent 4db70f3580
commit 4bf471f494
2 changed files with 5 additions and 2 deletions

View File

@ -3032,7 +3032,8 @@ class Text(Widget):
forwards=None, backwards=None, exact=None, forwards=None, backwards=None, exact=None,
regexp=None, nocase=None, count=None, elide=None): regexp=None, nocase=None, count=None, elide=None):
"""Search PATTERN beginning from INDEX until STOPINDEX. """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'] args = [self._w, 'search']
if forwards: args.append('-forwards') if forwards: args.append('-forwards')
if backwards: args.append('-backwards') if backwards: args.append('-backwards')
@ -3041,7 +3042,7 @@ class Text(Widget):
if nocase: args.append('-nocase') if nocase: args.append('-nocase')
if elide: args.append('-elide') if elide: args.append('-elide')
if count: args.append('-count'); args.append(count) 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(pattern)
args.append(index) args.append(index)
if stopindex: args.append(stopindex) if stopindex: args.append(stopindex)

View File

@ -80,6 +80,8 @@ Core and Builtins
Library Library
------- -------
- Issue #4890: Handle empty text search pattern in Tkinter.Text.search.
- Issue #5170: Fixed Unicode output bug in logging and added test case. - Issue #5170: Fixed Unicode output bug in logging and added test case.
This is a regression which did not occur in 2.5. This is a regression which did not occur in 2.5.