ahamilton/eris
1
0
Fork 0
Code Releases Activity

Coding style.

Browse source 
- Using subprocess.run
This commit is contained in:
Andrew Hamilton 2018-03-24 16:34:49 +10:00
parent 5715ab8ea9
commit 320670bb43
6 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
vigil/tools.py
View file

@ -108,8 +108,8 @@ def _fix_input(input_):
def _do_command(command, timeout=None, **kwargs):
stdout, stderr = "", ""
with contextlib.suppress(subprocess.CalledProcessError):
process = subprocess.Popen(command, stdout=subprocess.PIPE,
stderr=subprocess.PIPE, **kwargs)
process = subprocess.run(command, stdout=subprocess.PIPE,
stderr=subprocess.PIPE, **kwargs)
try:
stdout, stderr = process.communicate(timeout=timeout)
except subprocess.TimeoutExpired:
@ -122,8 +122,8 @@ def _run_command(command, success_status=Status.ok,
error_status=Status.problem):
status, output = success_status, ""
try:
process = subprocess.Popen(command, stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
process = subprocess.run(command, stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
stdout, stderr = process.communicate()
output = stdout + stderr
except subprocess.CalledProcessError: