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:44:24 +00:00
parent ee1ae7ccb7
commit ae09899fa3
2 changed files with 5 additions and 2 deletions

View File

@ -3016,7 +3016,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')
@ -3025,7 +3026,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

@ -160,6 +160,8 @@ Core and Builtins
Library Library
------- -------
- Issue #4890: Handle empty text search pattern in Tkinter.Text.search.
- Issue #4512 (part 2): Promote ``ZipImporter._get_filename()`` to be a - Issue #4512 (part 2): Promote ``ZipImporter._get_filename()`` to be a
public documented method ``ZipImporter.get_filename()``. public documented method ``ZipImporter.get_filename()``.