From: Thomas Wouters <thomas@python.org>
Date: Thu, 12 Jul 2001 12:28:10 +0000 (+0000)
Subject: Backport Tim's checkin 1.9:
X-Git-Tag: v2.1.1c1~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d7fe69f30a7821020bb105d5722f1753933db0ee;p=thirdparty%2FPython%2Fcpython.git

Backport Tim's checkin 1.9:

SF bug 418615: regular expression bug in pipes.py.
Obviously bad regexps, spotted by Jeffery Collins.
---

diff --git a/Lib/pipes.py b/Lib/pipes.py
index ceb32a869780..aaad0ebd11bf 100644
--- a/Lib/pipes.py
+++ b/Lib/pipes.py
@@ -123,10 +123,10 @@ class Template:
         if self.steps and self.steps[-1][1] == SINK:
             raise ValueError, \
                   '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, \
                   '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, \
                   'Template.append: missing $OUT in cmd'
         self.steps.append((cmd, kind))
@@ -145,10 +145,10 @@ class Template:
         if self.steps and self.steps[0][1] == SOURCE:
             raise ValueError, \
                   '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, \
                   '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, \
                   'Template.prepend: missing $OUT in cmd'
         self.steps.insert(0, (cmd, kind))