Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
8ba844ac
Commit
8ba844ac
authored
Aug 04, 2012
by
Andrew Svetlov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #13052: Fix IDLE crashing when replace string in Search/Replace dialog ended with '\'.
Patch by Roger Serwy.
parent
7687f3fb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
5 deletions
+28
-5
Lib/idlelib/ReplaceDialog.py
Lib/idlelib/ReplaceDialog.py
+25
-5
Misc/NEWS
Misc/NEWS
+3
-0
No files found.
Lib/idlelib/ReplaceDialog.py
View file @
8ba844ac
...
...
@@ -2,6 +2,8 @@ from Tkinter import *
from
idlelib
import
SearchEngine
from
idlelib.SearchDialogBase
import
SearchDialogBase
import
re
def
replace
(
text
):
root
=
text
.
_root
()
...
...
@@ -11,6 +13,7 @@ def replace(text):
dialog
=
engine
.
_replacedialog
dialog
.
open
(
text
)
class
ReplaceDialog
(
SearchDialogBase
):
title
=
"Replace Dialog"
...
...
@@ -55,8 +58,22 @@ class ReplaceDialog(SearchDialogBase):
def
default_command
(
self
,
event
=
None
):
if
self
.
do_find
(
self
.
ok
):
self
.
do_replace
()
self
.
do_find
(
0
)
if
self
.
do_replace
():
# Only find next match if replace succeeded.
# A bad re can cause a it to fail.
self
.
do_find
(
0
)
def
_replace_expand
(
self
,
m
,
repl
):
""" Helper function for expanding a regular expression
in the replace field, if needed. """
if
self
.
engine
.
isre
():
try
:
new
=
m
.
expand
(
repl
)
except
re
.
error
:
self
.
engine
.
report_error
(
repl
,
'Invalid Replace Expression'
)
new
=
None
else
:
new
=
repl
return
new
def
replace_all
(
self
,
event
=
None
):
prog
=
self
.
engine
.
getprog
()
...
...
@@ -86,7 +103,9 @@ class ReplaceDialog(SearchDialogBase):
line
,
m
=
res
chars
=
text
.
get
(
"%d.0"
%
line
,
"%d.0"
%
(
line
+
1
))
orig
=
m
.
group
()
new
=
m
.
expand
(
repl
)
new
=
self
.
_replace_expand
(
m
,
repl
)
if
new
is
None
:
break
i
,
j
=
m
.
span
()
first
=
"%d.%d"
%
(
line
,
i
)
last
=
"%d.%d"
%
(
line
,
j
)
...
...
@@ -103,7 +122,6 @@ class ReplaceDialog(SearchDialogBase):
text
.
undo_block_stop
()
if
first
and
last
:
self
.
show_hit
(
first
,
last
)
self
.
close
()
def
do_find
(
self
,
ok
=
0
):
if
not
self
.
engine
.
getprog
():
...
...
@@ -138,7 +156,9 @@ class ReplaceDialog(SearchDialogBase):
m
=
prog
.
match
(
chars
,
col
)
if
not
prog
:
return
False
new
=
m
.
expand
(
self
.
replvar
.
get
())
new
=
self
.
_replace_expand
(
m
,
self
.
replvar
.
get
())
if
new
is
None
:
return
False
text
.
mark_set
(
"insert"
,
first
)
text
.
undo_block_start
()
if
m
.
group
():
...
...
Misc/NEWS
View file @
8ba844ac
...
...
@@ -92,6 +92,9 @@ Core and Builtins
Library
-------
- Issue #13052: Fix IDLE crashing when replace string in Search/Replace dialog
ended with '
\
'. Patch by Roger Serwy.
- Issue #15538: Fix compilation of the getnameinfo() / getaddrinfo()
emulation code. Patch by Philipp Hagemeister.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment