From a91e7be005514a062e30f6dc13dfd7e549687afa Mon Sep 17 00:00:00 2001 From: Thomas Nagy Date: Sat, 3 Sep 2016 18:36:19 +0200 Subject: [PATCH] Ignore subprocess timeouts on Python < 3.3 --- waflib/Context.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/waflib/Context.py b/waflib/Context.py index 5148dd74..02596fe5 100644 --- a/waflib/Context.py +++ b/waflib/Context.py @@ -333,9 +333,10 @@ class Context(ctx): cargs = {} if 'timeout' in kw: - cargs['timeout'] = kw['timeout'] - if not 'start_new_session' in kw: - kw['start_new_session'] = True + if sys.hexversion >= 0x3030000: + cargs['timeout'] = kw['timeout'] + if not 'start_new_session' in kw: + kw['start_new_session'] = True del kw['timeout'] if 'input' in kw: if kw['input']: @@ -418,9 +419,10 @@ class Context(ctx): cargs = {} if 'timeout' in kw: - cargs['timeout'] = kw['timeout'] - if not 'start_new_session' in kw: - kw['start_new_session'] = True + if sys.hexversion >= 0x3030000: + cargs['timeout'] = kw['timeout'] + if not 'start_new_session' in kw: + kw['start_new_session'] = True del kw['timeout'] if 'input' in kw: if kw['input']: