Ignore subprocess timeouts on Python < 3.3

This commit is contained in:
Thomas Nagy 2016-09-03 18:36:19 +02:00
parent 9f14c9dda0
commit a91e7be005
No known key found for this signature in database
GPG Key ID: 49B4C67C05277AAA
1 changed files with 8 additions and 6 deletions

View File

@ -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']: