FWGS
/
waf
mirror of https://gitlab.com/ita1024/waf.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Python 3.3 fix

This commit is contained in:
Thomas Nagy 2016-09-03 22:24:29 +02:00
parent 71aed22539
commit af172413f4
No known key found for this signature in database
GPG Key ID: 49B4C67C05277AAA
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
waflib/Utils.py
View File

@ -870,7 +870,9 @@ def run_regular_process(cmd, kwargs, cargs={}):
else:
proc.kill()
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
else:
out, err = (None, None)

4
waflib/processor.py
View File

@ -39,7 +39,9 @@ def run():
else:
proc.kill()
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
except Exception as e:
exc_type, exc_value, tb = sys.exc_info()