mirror of https://gitlab.com/ita1024/waf.git
Python 3.3 fix
This commit is contained in:
parent
71aed22539
commit
af172413f4
|
@ -870,7 +870,9 @@ def run_regular_process(cmd, kwargs, cargs={}):
|
||||||
else:
|
else:
|
||||||
proc.kill()
|
proc.kill()
|
||||||
out, err = proc.communicate()
|
out, err = proc.communicate()
|
||||||
raise TimeoutExpired(proc.args, timeout=cargs['timeout'], output=out, stderr=err)
|
exc = TimeoutExpired(proc.args, timeout=cargs['timeout'], output=out)
|
||||||
|
exc.stderr = err
|
||||||
|
raise exc
|
||||||
status = proc.returncode
|
status = proc.returncode
|
||||||
else:
|
else:
|
||||||
out, err = (None, None)
|
out, err = (None, None)
|
||||||
|
|
|
@ -39,7 +39,9 @@ def run():
|
||||||
else:
|
else:
|
||||||
proc.kill()
|
proc.kill()
|
||||||
out, err = proc.communicate()
|
out, err = proc.communicate()
|
||||||
raise TimeoutExpired(proc.args, timeout=cargs['timeout'], output=out, stderr=err)
|
exc = TimeoutExpired(proc.args, timeout=cargs['timeout'], output=out)
|
||||||
|
exc.stderr = err
|
||||||
|
raise exc
|
||||||
ret = proc.returncode
|
ret = proc.returncode
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
exc_type, exc_value, tb = sys.exc_info()
|
exc_type, exc_value, tb = sys.exc_info()
|
||||||
|
|
Loading…
Reference in New Issue