From 3ec0454995dec97fb5fa1eceda93c59d33df3d0e Mon Sep 17 00:00:00 2001 From: Radostin Stoyanov Date: Thu, 3 Aug 2017 14:13:02 +0100 Subject: Use explicit import Reduce the number of import statements and improve readability. Update the unit tests to match these changes. --- src/virtBootstrap/sources.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/virtBootstrap/sources.py') diff --git a/src/virtBootstrap/sources.py b/src/virtBootstrap/sources.py index f4bae72..40b66f9 100644 --- a/src/virtBootstrap/sources.py +++ b/src/virtBootstrap/sources.py @@ -25,7 +25,7 @@ import shutil import getpass import os import logging -from subprocess import CalledProcessError, PIPE, Popen +import subprocess from virtBootstrap import utils @@ -259,12 +259,17 @@ class DockerSource(object): """ Parse the output from skopeo copy to track download progress. """ - proc = Popen(cmd, stdout=PIPE, stderr=PIPE, universal_newlines=True) + proc = subprocess.Popen( + cmd, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + universal_newlines=True + ) # Without `make_async`, `fd.read` in `read_async` blocks. utils.make_async(proc.stdout) if not self.parse_output(proc): - raise CalledProcessError(proc.returncode, ' '.join(cmd)) + raise subprocess.CalledProcessError(proc.returncode, ' '.join(cmd)) def validate_image_layers(self): """ -- cgit