diff --git a/virttest/asset.py b/virttest/asset.py index d40af7352b..e5ab0369fe 100644 --- a/virttest/asset.py +++ b/virttest/asset.py @@ -5,9 +5,10 @@ import re import shutil +from avocado.utils import astring, crypto, download, genio, git, process + from six import StringIO -from avocado.utils import astring, crypto, download, genio, git, process from six import string_types from six.moves import urllib diff --git a/virttest/utils_config.py b/virttest/utils_config.py index a476c13da4..1d25fb48cd 100644 --- a/virttest/utils_config.py +++ b/virttest/utils_config.py @@ -3,10 +3,10 @@ import logging import os.path -from six import StringIO - from avocado.utils import distro +from six import StringIO + LOG = logging.getLogger("avocado." + __name__) diff --git a/virttest/utils_disk.py b/virttest/utils_disk.py index 510b793918..d0176c57be 100644 --- a/virttest/utils_disk.py +++ b/virttest/utils_disk.py @@ -15,12 +15,12 @@ import string import tempfile -from functools import cmp_to_key - from avocado.core import exceptions from avocado.utils import process, wait from avocado.utils.service import SpecificServiceManager +from functools import cmp_to_key + from virttest import error_context, remote, utils_misc, utils_numeric PARTITION_TABLE_TYPE_MBR = "msdos"