summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorTim Peters <tim.peters@gmail.com>2003-03-07 21:10:21 (GMT)
committerTim Peters <tim.peters@gmail.com>2003-03-07 21:10:21 (GMT)
commit61cd0db3d2d3f78c85ba7c1ee52b5df63837a8ba (patch)
tree5cdde5fd789d50dfce5450dce6e96bb5b9c0eeee /Lib/test
parent669454e9dc4f8472b9239b4abdec1b7e111bb864 (diff)
downloadcpython-61cd0db3d2d3f78c85ba7c1ee52b5df63837a8ba.zip
cpython-61cd0db3d2d3f78c85ba7c1ee52b5df63837a8ba.tar.gz
cpython-61cd0db3d2d3f78c85ba7c1ee52b5df63837a8ba.tar.bz2
Don't quote the path to Python unless the path contains an embedded space.
Quoting the path doesn't work on Win2K (cmd.exe) regardless, this is just a hack to let the test pass again on Win2K (so long as Python isn't installed in a path that does contain an embedded space). On Win2K it looks like we'd also have to add a second pair of double quotes, around the entire command line.
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/test_popen.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/Lib/test/test_popen.py b/Lib/test/test_popen.py
index 7a0ef9b..2b687ad 100644
--- a/Lib/test/test_popen.py
+++ b/Lib/test/test_popen.py
@@ -14,8 +14,11 @@ from os import popen
# python -c "import sys;print sys.argv" {rest_of_commandline}
# This results in Python being spawned and printing the sys.argv list.
# We can then eval() the result of this, and see what each argv was.
+python = sys.executable
+if ' ' in python:
+ python = '"' + python + '"' # quote embedded space for cmdline
def _do_test_commandline(cmdline, expected):
- cmd = '"%s" -c "import sys;print sys.argv" %s' % (sys.executable, cmdline)
+ cmd = '%s -c "import sys;print sys.argv" %s' % (python, cmdline)
data = popen(cmd).read()
got = eval(data)[1:] # strip off argv[0]
if got != expected: