os.execvp(cmd[0], cmd)
os._exit(1) # Shouldn't get here
- except os.error, e:
+ except os.error as e:
if self.control_stderr:
os.dup2(parentErr, 2) # Reconnect to parent's stdout
sys.stderr.write("**execvp failed, '%s'**\n" %
time.sleep(execvp_grace_seconds)
try:
pid, err = os.waitpid(self.pid, os.WNOHANG)
- except os.error, (errno, msg):
+ except os.error as error:
+ errno, msg = error
if errno == 10:
raise SubprocessError("Subprocess '%s' failed." % self.cmd)
raise SubprocessError("Subprocess failed[%d]: %s" % (errno, msg))
# Only got here if subprocess is not gone:
raise SubprocessError(
"Failed kill of subproc %d, '%s', with signals %s" %
- (self.pid, self.cmd, map(lambda(x): x[0], sigs)))
+ (self.pid, self.cmd, map(lambda x: x[0], sigs)))
def __del__(self):
"""Terminate the subprocess"""