summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGregory P. Smith <greg@krypto.org>2012-02-14 00:43:55 (GMT)
committerGregory P. Smith <greg@krypto.org>2012-02-14 00:43:55 (GMT)
commit53ec8ae6a518f1b798340976e3f57eab9db57b8a (patch)
treea8404b3e56ba839f16d89777c975e1becd524a6a
parentaed555393289849e806083d443aec44cbfb10787 (diff)
parent9903c705b89c197c96e8286c9351a31b9c23fd44 (diff)
downloadcpython-53ec8ae6a518f1b798340976e3f57eab9db57b8a.zip
cpython-53ec8ae6a518f1b798340976e3f57eab9db57b8a.tar.gz
cpython-53ec8ae6a518f1b798340976e3f57eab9db57b8a.tar.bz2
re.escape os.sep so that \ is interpreted properly in the regex.
-rw-r--r--Lib/lib2to3/tests/test_main.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/Lib/lib2to3/tests/test_main.py b/Lib/lib2to3/tests/test_main.py
index 225c15d..a498c5a 100644
--- a/Lib/lib2to3/tests/test_main.py
+++ b/Lib/lib2to3/tests/test_main.py
@@ -3,6 +3,7 @@ import codecs
import io
import logging
import os
+import re
import shutil
import sys
import tempfile
@@ -94,10 +95,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.assertRegex(
- 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."""