Kaydet (Commit) 0c44c047 authored tarafından Jack Jansen's avatar Jack Jansen

sys.executable can contain spaces, cater for this when passing it to

os.popen(). Fixes #692222.
üst 9ce623fc
...@@ -27,7 +27,7 @@ f = file(fname, "w") ...@@ -27,7 +27,7 @@ f = file(fname, "w")
f.write(input) f.write(input)
f.close() f.close()
p = popen("%s %s" % (executable, fname)) p = popen('"%s" %s' % (executable, fname))
output = p.read() output = p.read()
p.close() p.close()
vereq(output, """\ vereq(output, """\
...@@ -55,7 +55,7 @@ f = file(fname, "w") ...@@ -55,7 +55,7 @@ f = file(fname, "w")
f.write(input) f.write(input)
f.close() f.close()
p = popen("%s %s" % (executable, fname)) p = popen('"%s" %s' % (executable, fname))
output = p.read() output = p.read()
p.close() p.close()
vereq(output, """\ vereq(output, """\
......
...@@ -15,7 +15,7 @@ from os import popen ...@@ -15,7 +15,7 @@ from os import popen
# This results in Python being spawned and printing the sys.argv list. # 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. # We can then eval() the result of this, and see what each argv was.
def _do_test_commandline(cmdline, expected): 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' % (sys.executable, cmdline)
data = popen(cmd).read() data = popen(cmd).read()
got = eval(data)[1:] # strip off argv[0] got = eval(data)[1:] # strip off argv[0]
if got != expected: if got != expected:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment