summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorJack Jansen <jack.jansen@cwi.nl>2003-02-24 15:26:39 (GMT)
committerJack Jansen <jack.jansen@cwi.nl>2003-02-24 15:26:39 (GMT)
commit0c44c0477bf1e6e00c15f6d316e293e56d057e40 (patch)
tree615cc3034ff6598b7537a5b7ed60661ab5c05d0e /Lib
parent9ce623fce5707c9c2c9c4716d719e4178a08f80b (diff)
downloadcpython-0c44c0477bf1e6e00c15f6d316e293e56d057e40.zip
cpython-0c44c0477bf1e6e00c15f6d316e293e56d057e40.tar.gz
cpython-0c44c0477bf1e6e00c15f6d316e293e56d057e40.tar.bz2
sys.executable can contain spaces, cater for this when passing it to
os.popen(). Fixes #692222.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_atexit.py4
-rw-r--r--Lib/test/test_popen.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/Lib/test/test_atexit.py b/Lib/test/test_atexit.py
index 324b76e..1d120df 100644
--- a/Lib/test/test_atexit.py
+++ b/Lib/test/test_atexit.py
@@ -27,7 +27,7 @@ f = file(fname, "w")
f.write(input)
f.close()
-p = popen("%s %s" % (executable, fname))
+p = popen('"%s" %s' % (executable, fname))
output = p.read()
p.close()
vereq(output, """\
@@ -55,7 +55,7 @@ f = file(fname, "w")
f.write(input)
f.close()
-p = popen("%s %s" % (executable, fname))
+p = popen('"%s" %s' % (executable, fname))
output = p.read()
p.close()
vereq(output, """\
diff --git a/Lib/test/test_popen.py b/Lib/test/test_popen.py
index 9111ec5..7a0ef9b 100644
--- a/Lib/test/test_popen.py
+++ b/Lib/test/test_popen.py
@@ -15,7 +15,7 @@ from os import popen
# 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.
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()
got = eval(data)[1:] # strip off argv[0]
if got != expected: