Fix Python 2.6 support

This commit is contained in:
Ivan Kravets
2015-02-23 11:50:14 +02:00
parent d1ca17c406
commit 2ac6d63ffc
6 changed files with 49 additions and 24 deletions

View File

@@ -146,14 +146,14 @@ def exec_command(*args, **kwargs):
result['out'], result['err'] = p.communicate()
result['returncode'] = p.returncode
except KeyboardInterrupt:
raise exception.AbortedByUser()
finally:
for s in ("stdout", "stderr"):
if isinstance(kwargs[s], AsyncPipe):
kwargs[s].close()
raise exception.AbortedByUser()
for s in ("stdout", "stderr"):
if isinstance(kwargs[s], AsyncPipe):
kwargs[s].close()
result[s[3:]] = "\n".join(kwargs[s].get_buffer())
for k, v in result.iteritems():