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

Always remove the timeout and input arguments from the Popen constructor

This commit is contained in:
Thomas Nagy 2015-08-23 18:52:45 +02:00
parent 03ad2fff74
commit cadd260a9e
No known key found for this signature in database
GPG Key ID: 67A565EDFDF90E64
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
waflib/Context.py
View File

@ -341,12 +341,14 @@ class Context(ctx):
raise Errors.WafError("Program %s not found!" % cmd[0])
wargs = {}
if kw.get('timeout', None):
wargs['timeout'] = kw['timeout']
if 'timeout' in kw:
if kw['timeout'] is not None:
wargs['timeout'] = kw['timeout']
del kw['timeout']
if kw.get('input', None) is not None:
wargs['input'] = kw['input']
kw['stdin'] = Utils.subprocess.PIPE
if 'input' in kw:
if kw['input']:
wargs['input'] = kw['input']
kw['stdin'] = Utils.subprocess.PIPE
del kw['input']
try:
@ -419,12 +421,14 @@ class Context(ctx):
self.to_log(cmd)
wargs = {}
if kw.get('timeout', None):
wargs['timeout'] = kw['timeout']
if 'timeout' in kw:
if kw['timeout'] is not None:
wargs['timeout'] = kw['timeout']
del kw['timeout']
if 'input' in kw:
wargs['input'] = kw['input']
kw['stdin'] = Utils.subprocess.PIPE
if kw['input']:
wargs['input'] = kw['input']
kw['stdin'] = Utils.subprocess.PIPE
del kw['input']
try: