The test for re.engine was misfiring because re.engine is no longer
defined and the default was "pre" instead of "sre". Give up on 1.5.2 compatibility, hardcode the sre solution. However, this XXX comment still applies, AFAIK: # XXX This code depends on internals of the regular expression # engine! There's no standard API to do a substitution when you # have already found the match. One should be added.
This commit is contained in:
parent
9e4e050c59
commit
77f6ccd1f7
|
@ -6,6 +6,7 @@ from Tkinter import *
|
|||
import tkMessageBox
|
||||
import SearchEngine
|
||||
from SearchDialogBase import SearchDialogBase
|
||||
import sre_parse
|
||||
|
||||
def replace(text):
|
||||
root = text._root()
|
||||
|
@ -158,14 +159,6 @@ class ReplaceDialog(SearchDialogBase):
|
|||
# XXX This code depends on internals of the regular expression
|
||||
# engine! There's no standard API to do a substitution when you
|
||||
# have already found the match. One should be added.
|
||||
# The solution here is designed to be backwards compatible
|
||||
# with previous Python versions, e.g. 1.5.2.
|
||||
# XXX This dynamic test should be done only once.
|
||||
if getattr(re, "engine", "pre") == "pre":
|
||||
return re.pcre_expand(m, template)
|
||||
else: # sre
|
||||
# XXX This import should be avoidable...
|
||||
import sre_parse
|
||||
# XXX This parses the template over and over...
|
||||
ptemplate = sre_parse.parse_template(template, m.re)
|
||||
return sre_parse.expand_template(ptemplate, m)
|
||||
|
|
Loading…
Reference in New Issue