From: R. David Murray <rdmurray@bitdance.com>
Date: Mon, 27 Dec 2010 00:03:13 +0000 (+0000)
Subject: Escape file path before searching for it in output via regex
X-Git-Tag: v3.2rc1~333
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ab9d8d64a71d3c431e99d6ccf0a3e696b24d4a6a;p=python

Escape file path before searching for it in output via regex
---

diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py
index 0ed4706e7c..fb41fc9b25 100644
--- a/Lib/test/test_site.py
+++ b/Lib/test/test_site.py
@@ -10,6 +10,7 @@ from test.support import captured_stderr
 import builtins
 import os
 import sys
+import re
 import encodings
 import subprocess
 import sysconfig
@@ -108,7 +109,8 @@ class HelperFunctionsTests(unittest.TestCase):
         with captured_stderr() as err_out:
             site.addpackage(pth_dir, pth_fn, set())
         self.assertRegex(err_out.getvalue(), "line 1")
-        self.assertRegex(err_out.getvalue(), os.path.join(pth_dir, pth_fn))
+        self.assertRegex(err_out.getvalue(),
+            re.escape(os.path.join(pth_dir, pth_fn)))
         # XXX: the previous two should be independent checks so that the
         # order doesn't matter.  The next three could be a single check
         # but my regex foo isn't good enough to write it.
@@ -122,7 +124,8 @@ class HelperFunctionsTests(unittest.TestCase):
         with captured_stderr() as err_out:
             site.addpackage(pth_dir, pth_fn, set())
         self.assertRegex(err_out.getvalue(), "line 2")
-        self.assertRegex(err_out.getvalue(), os.path.join(pth_dir, pth_fn))
+        self.assertRegex(err_out.getvalue(),
+            re.escape(os.path.join(pth_dir, pth_fn)))
         # XXX: ditto previous XXX comment.
         self.assertRegex(err_out.getvalue(), 'Traceback')
         self.assertRegex(err_out.getvalue(), 'ImportError')
@@ -133,7 +136,8 @@ class HelperFunctionsTests(unittest.TestCase):
         with captured_stderr() as err_out:
             site.addpackage(pth_dir, pth_fn, set())
         self.assertRegex(err_out.getvalue(), "line 1")
-        self.assertRegex(err_out.getvalue(), os.path.join(pth_dir, pth_fn))
+        self.assertRegex(err_out.getvalue(),
+            re.escape(os.path.join(pth_dir, pth_fn)))
         # XXX: ditto previous XXX comment.
         self.assertRegex(err_out.getvalue(), 'Traceback')
         self.assertRegex(err_out.getvalue(), 'TypeError')