summaryrefslogtreecommitdiff
path: root/runtest.py
diff options
context:
space:
mode:
authoranatoly techtonik <techtonik@gmail.com>2012-12-12 17:33:12 +0300
committeranatoly techtonik <techtonik@gmail.com>2012-12-12 17:33:12 +0300
commitd89d8f773779306a53ab43b06f575d07d0c0e08c (patch)
tree441c691ee6284943f16ac88479e4431ab9fbed09 /runtest.py
parentc840d295eac3ffb45521447178145bab18dfd193 (diff)
downloadscons-d89d8f773779306a53ab43b06f575d07d0c0e08c.tar.gz
os.spawnv is here since Python 1.6, removing compatibility code
Diffstat (limited to 'runtest.py')
-rw-r--r--runtest.py21
1 files changed, 5 insertions, 16 deletions
diff --git a/runtest.py b/runtest.py
index a88cfd2f..55a16f50 100644
--- a/runtest.py
+++ b/runtest.py
@@ -390,22 +390,11 @@ if use_subprocess:
else:
has_subprocess = False
# Set up lowest-common-denominator spawning of a process on both Windows
- # and non-Windows systems that works all the way back to Python 1.5.2.
- try:
- os.spawnv
- except AttributeError:
- def spawn_it(command_args):
- pid = os.fork()
- if pid == 0:
- os.execv(command_args[0], command_args)
- else:
- pid, status = os.waitpid(pid, 0)
- return (None, None, status >> 8)
- else:
- def spawn_it(command_args):
- command = command_args[0]
- command_args = [escape(c) for c in command_args]
- return (None, None, os.spawnv(os.P_WAIT, command, command_args))
+ # and non-Windows systems that works all the way back to Python 1.6
+ def spawn_it(command_args):
+ command = command_args[0]
+ command_args = [escape(c) for c in command_args]
+ return (None, None, os.spawnv(os.P_WAIT, command, command_args))
class Base(object):
def __init__(self, path, spe=None):