[Python-checkins] r80117 - in python/branches/release31-maint: Lib/test/test_cmd_line.py

[victor.stinner]

Author: victor.stinner
Date: Fri Apr 16 17:44:04 2010
New Revision: 80117

Log:
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
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/test/test_cmd_line.py

Modified: python/branches/release31-maint/Lib/test/test_cmd_line.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_cmd_line.py	(original)
+++ python/branches/release31-maint/Lib/test/test_cmd_line.py	Fri Apr 16 17:44:04 2010
@@ -176,7 +176,15 @@
             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)