SF bug 418615: regular expression bug in pipes.py.
Obviously bad regexps, spotted by Jeffery Collins. HELP! I can't run this on Windows, and the module test() function probably doesn't work on anyone's box. Could a Unixoid please write an at least minimal working test and add it to the std test suite?
This commit is contained in:
parent
d29abb9915
commit
c09cee4d92
|
@ -123,10 +123,10 @@ class Template:
|
||||||
if self.steps and self.steps[-1][1] == SINK:
|
if self.steps and self.steps[-1][1] == SINK:
|
||||||
raise ValueError, \
|
raise ValueError, \
|
||||||
'Template.append: already ends with SINK'
|
'Template.append: already ends with SINK'
|
||||||
if kind[0] == 'f' and not re.search('\$IN\b', cmd):
|
if kind[0] == 'f' and not re.search(r'\$IN\b', cmd):
|
||||||
raise ValueError, \
|
raise ValueError, \
|
||||||
'Template.append: missing $IN in cmd'
|
'Template.append: missing $IN in cmd'
|
||||||
if kind[1] == 'f' and not re.search('\$OUT\b', cmd):
|
if kind[1] == 'f' and not re.search(r'\$OUT\b', cmd):
|
||||||
raise ValueError, \
|
raise ValueError, \
|
||||||
'Template.append: missing $OUT in cmd'
|
'Template.append: missing $OUT in cmd'
|
||||||
self.steps.append((cmd, kind))
|
self.steps.append((cmd, kind))
|
||||||
|
@ -145,10 +145,10 @@ class Template:
|
||||||
if self.steps and self.steps[0][1] == SOURCE:
|
if self.steps and self.steps[0][1] == SOURCE:
|
||||||
raise ValueError, \
|
raise ValueError, \
|
||||||
'Template.prepend: already begins with SOURCE'
|
'Template.prepend: already begins with SOURCE'
|
||||||
if kind[0] == 'f' and not re.search('\$IN\b', cmd):
|
if kind[0] == 'f' and not re.search(r'\$IN\b', cmd):
|
||||||
raise ValueError, \
|
raise ValueError, \
|
||||||
'Template.prepend: missing $IN in cmd'
|
'Template.prepend: missing $IN in cmd'
|
||||||
if kind[1] == 'f' and not re.search('\$OUT\b', cmd):
|
if kind[1] == 'f' and not re.search(r'\$OUT\b', cmd):
|
||||||
raise ValueError, \
|
raise ValueError, \
|
||||||
'Template.prepend: missing $OUT in cmd'
|
'Template.prepend: missing $OUT in cmd'
|
||||||
self.steps.insert(0, (cmd, kind))
|
self.steps.insert(0, (cmd, kind))
|
||||||
|
|
Loading…
Reference in New Issue