mirror of
https://github.com/AdaCore/cpython.git
synced 2026-02-12 12:57:15 -08:00
Merged revisions 69463 via svnmerge from
svn+ssh://pythondev/python/branches/py3k
................
r69463 | guilherme.polo | 2009-02-09 14:44:24 -0200 (Mon, 09 Feb 2009) | 10 lines
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:
@@ -3016,7 +3016,8 @@ class Text(Widget):
|
||||
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')
|
||||
@@ -3025,7 +3026,7 @@ class Text(Widget):
|
||||
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)
|
||||
|
||||
@@ -116,6 +116,8 @@ Core and Builtins
|
||||
Library
|
||||
-------
|
||||
|
||||
- Issue #4890: Handle empty text search pattern in Tkinter.Text.search.
|
||||
|
||||
- Partial fix to issue #1731706: memory leak in Tkapp_Call when calling
|
||||
from a thread different than the one that created the Tcl interpreter.
|
||||
Patch by Robert Hancock.
|
||||
|
||||
Reference in New Issue
Block a user