Merged revisions 80116 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r80116 | victor.stinner | 2010-04-16 17:10:27 +0200 (ven., 16 avril 2010) | 2 lines

  Issue #7605: Fix test_cmd_line if the current working directory is not ASCII
........

diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
index 87ae2b66199edb98547e6f65fe6af0b2690ed37c..5143ed79f00ccd3b4c7612144ff7916cbbf7e6f4 100644 (file)
--- a/Lib/test/test_cmd_line.py
+++ b/Lib/test/test_cmd_line.py
@@ -176,7 +176,15 @@ class CmdLineTest(unittest.TestCase):
             path1 = "ABCDE" * 100
             path2 = "FGHIJ" * 100
             env['PYTHONPATH'] = path1 + os.pathsep + path2
-            p = _spawn_python('-S', '-c', 'import sys; print(sys.path)')
+
+            code = """
+import sys
+path = ":".join(sys.path)
+path = path.encode("ascii", "backslashreplace")
+sys.stdout.buffer.write(path)"""
+            code = code.strip().splitlines()
+            code = '; '.join(code)
+            p = _spawn_python('-S', '-c', code)
             stdout, _ = p.communicate()
             self.assertTrue(path1.encode('ascii') in stdout)
             self.assertTrue(path2.encode('ascii') in stdout)