[Python-checkins] cpython (2.7): Issue #13930: fix a / to use os.sep so that the test works on Windows.

gregory.p.smith python-checkins at python.org
Tue Feb 14 01:29:38 CET 2012


http://hg.python.org/cpython/rev/34445738954b
changeset:   74922:34445738954b
branch:      2.7
parent:      74916:3925081a7ca0
user:        Gregory P. Smith <greg at krypto.org>
date:        Mon Feb 13 16:28:54 2012 -0800
summary:
  Issue #13930: fix a / to use os.sep so that the test works on Windows.

files:
  Lib/lib2to3/tests/test_main.py |  6 ++++--
  1 files changed, 4 insertions(+), 2 deletions(-)


diff --git a/Lib/lib2to3/tests/test_main.py b/Lib/lib2to3/tests/test_main.py
--- a/Lib/lib2to3/tests/test_main.py
+++ b/Lib/lib2to3/tests/test_main.py
@@ -104,8 +104,10 @@
             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)
-        self.assertRegexpMatches(stderr, r"No changes to .*/__init__\.py")
-        self.assertNotRegex(stderr, r"No changes to .*/trivial\.py")
+        self.assertRegexpMatches(
+                stderr, r"No changes to .*/__init__\.py".replace("/", os.sep))
+        self.assertNotRegex(
+                stderr, r"No changes to .*/trivial\.py".replace("/", os.sep))
 
     def test_filename_changing_on_output_two_files(self):
         """2to3 two files in one directory with a new output dir."""

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list