From e1dbbbfc514dec56e6cf695cb7f127a4782ec6b7 Mon Sep 17 00:00:00 2001 From: "Gregory P. Smith" Date: Mon, 13 Feb 2012 16:45:47 -0800 Subject: re.escape os.sep so that \ is interpreted properly in the regex. --- Lib/lib2to3/tests/test_main.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Lib/lib2to3/tests/test_main.py b/Lib/lib2to3/tests/test_main.py index 455d8a7..7f8b25c 100644 --- a/Lib/lib2to3/tests/test_main.py +++ b/Lib/lib2to3/tests/test_main.py @@ -3,6 +3,7 @@ import sys import codecs import logging import os +import re import shutil import StringIO import sys @@ -104,10 +105,11 @@ class TestMain(unittest.TestCase): self.assertIn("Writing converted %s to %s" % ( os.path.join(self.py2_src_dir, name), os.path.join(self.py3_dest_dir, name+suffix)), stderr) + sep = re.escape(os.sep) self.assertRegexpMatches( - stderr, r"No changes to .*/__init__\.py".replace("/", os.sep)) + stderr, r"No changes to .*/__init__\.py".replace("/", sep)) self.assertNotRegex( - stderr, r"No changes to .*/trivial\.py".replace("/", os.sep)) + stderr, r"No changes to .*/trivial\.py".replace("/", sep)) def test_filename_changing_on_output_two_files(self): """2to3 two files in one directory with a new output dir.""" -- cgit v0.12