livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make embedded Python scripts compatible with Python 2.5 *SIGH* 

Apparently our TeamCity build machines are still not up to Python 2.6.
meow-7.2.2
Nat Goodspeed 2012-01-18 10:56:13 -05:00
parent ff4addd1b4
commit 1ed5bb3ada
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/llcommon/tests/llprocesslauncher_test.cpp
View File

@ -181,6 +181,7 @@ public:
// realpath() to compare properly.
NamedTempDir():
mPath(python_out("mkdtemp()",
"from __future__ import with_statement\n"
"import os.path, sys, tempfile\n"
"with open(sys.argv[1], 'w') as f:\n"
" f.write(os.path.realpath(tempfile.mkdtemp()))\n"))
@ -518,6 +519,7 @@ namespace tut
// create one. Naturally, ensure we clean it up when done.
NamedTempDir tempdir;
PythonProcessLauncher py("getcwd()",
"from __future__ import with_statement\n"
"import os, sys\n"
"with open(sys.argv[1], 'w') as f:\n"
" f.write(os.getcwd())\n");
@ -531,6 +533,7 @@ namespace tut
{
set_test_name("clearArguments()");
PythonProcessLauncher py("args",
"from __future__ import with_statement\n"
"import sys\n"
// note nonstandard output-file arg!
"with open(sys.argv[3], 'w') as f:\n"
@ -568,6 +571,7 @@ namespace tut
{
set_test_name("explicit kill()");
PythonProcessLauncher py("kill()",
"from __future__ import with_statement\n"
"import sys, time\n"
"with open(sys.argv[1], 'w') as f:\n"
" f.write('ok')\n"
@ -610,6 +614,7 @@ namespace tut
LLProcessLauncher::ll_pid_t pid(0);
{
PythonProcessLauncher py("kill()",
"from __future__ import with_statement\n"
"import sys, time\n"
"with open(sys.argv[1], 'w') as f:\n"
" f.write('ok')\n"
@ -655,6 +660,7 @@ namespace tut
LLProcessLauncher::ll_pid_t pid(0);
{
PythonProcessLauncher py("orphan()",
"from __future__ import with_statement\n"
"import sys, time\n"
"with open(sys.argv[1], 'w') as f:\n"
" f.write('ok')\n"