diff --git a/avocado/utils/build.py b/avocado/utils/build.py index 2be48098db7957df6871102afaad58b4f1d562d1..c8e307271f56d5e7e52b31b3e4d2a5e0f2f8feeb 100644 --- a/avocado/utils/build.py +++ b/avocado/utils/build.py @@ -14,7 +14,7 @@ import os -import process +from . import process def make(path, make='make', env=None, extra_args='', ignore_status=False, allow_output_check='none'): diff --git a/avocado/utils/download.py b/avocado/utils/download.py index a85474a71c00f0db78682aa04a970cdc69984078..cc62955dbe8131abf1cce991305d0f91f21ecece 100644 --- a/avocado/utils/download.py +++ b/avocado/utils/download.py @@ -23,7 +23,7 @@ import socket import shutil import urllib2 -from avocado.utils import aurl +from . import aurl log = logging.getLogger('avocado.test') diff --git a/avocado/utils/gdb.py b/avocado/utils/gdb.py index 6550184702f8589ffcff49f5e43bdb642e007153..bdde9778a4d836e74b5afd41aa8eec411dae6ff2 100644 --- a/avocado/utils/gdb.py +++ b/avocado/utils/gdb.py @@ -30,8 +30,8 @@ try: except ImportError: import subprocess -from avocado.utils import network -from avocado.utils.external import gdbmi_parser +from . import network +from .external import gdbmi_parser GDB_PROMPT = '(gdb)' GDB_EXIT = '^exit' diff --git a/avocado/utils/genio.py b/avocado/utils/genio.py index 21a95cf210f959076a95d51c2bdbd8079c064453..0e88863c04e3fd780232e40ebe2fcf2b572cf5f8 100644 --- a/avocado/utils/genio.py +++ b/avocado/utils/genio.py @@ -20,7 +20,7 @@ import logging import os import time -from avocado.utils import path as utils_path +from . import path as utils_path log = logging.getLogger('avocado.test') diff --git a/avocado/utils/kernel_build.py b/avocado/utils/kernel_build.py index e657072ea90d2b7be6bbd0bd2538b54565afffb0..2fbe29ee6cb28d64f974c8d1c95a67249edfaaad 100755 --- a/avocado/utils/kernel_build.py +++ b/avocado/utils/kernel_build.py @@ -18,7 +18,7 @@ import os import logging import shutil -from avocado.utils import download, archive, build +from . import download, archive, build log = logging.getLogger('avocado.test') diff --git a/avocado/utils/memory.py b/avocado/utils/memory.py index fdeed62348da2e5c277d30c2887398b58e9a1a47..5515cd78eac424d804689979804692e12bae35c9 100644 --- a/avocado/utils/memory.py +++ b/avocado/utils/memory.py @@ -22,7 +22,7 @@ import glob import math import logging -from avocado.utils import process +from . import process # Returns total memory in kb diff --git a/avocado/utils/path.py b/avocado/utils/path.py index 8553db750dc9cc3d3feae0d2b0eec185e995edc0..3c761f7fba60bfb213e44baed29af16f8c0583a9 100644 --- a/avocado/utils/path.py +++ b/avocado/utils/path.py @@ -19,7 +19,7 @@ Avocado path related functions. import os import stat -from avocado.utils import aurl +from . import aurl PY_EXTENSIONS = ['.py'] diff --git a/avocado/utils/process.py b/avocado/utils/process.py index a3a15b16cf28f54112ca14fa3b0d4ce76a021b08..8e78eaf9bf67ded746d168d29508d8c35915be65 100644 --- a/avocado/utils/process.py +++ b/avocado/utils/process.py @@ -34,8 +34,9 @@ except ImportError: import subprocess SUBPROCESS32_SUPPORT = False +from . import gdb + from avocado import runtime -from avocado.utils import gdb from avocado.core import exceptions log = logging.getLogger('avocado.test') diff --git a/avocado/utils/remote.py b/avocado/utils/remote.py index f78e85d86f00c49f278000de011bb95bfb84ec1c..634bd89fd10ba370f147a7b063bb898cf88a0744 100644 --- a/avocado/utils/remote.py +++ b/avocado/utils/remote.py @@ -21,7 +21,7 @@ import logging import time from avocado.core import output -from avocado.utils import process +from . import process LOG = logging.getLogger('avocado.test') diff --git a/avocado/utils/script.py b/avocado/utils/script.py index 12919981d7b5a77c490eeec90d347e344879a748..ccde94b59348f901ca6be3c648a20f9701031278 100644 --- a/avocado/utils/script.py +++ b/avocado/utils/script.py @@ -20,7 +20,7 @@ import os import tempfile import shutil -from avocado.utils import path as utils_path +from . import path as utils_path class Script(object): diff --git a/avocado/utils/software_manager.py b/avocado/utils/software_manager.py index 196eb3d6cf80a40ddc3edd30eb03a41e48ff8588..91647cff4efd653cc03a546ad51c68f51ef6d37b 100644 --- a/avocado/utils/software_manager.py +++ b/avocado/utils/software_manager.py @@ -49,10 +49,10 @@ except ImportError: else: HAS_YUM_MODULE = True -from avocado.utils import process -from avocado.utils import data_factory -from avocado.utils import distro -from avocado.utils import path as utils_path +from . import process +from . import data_factory +from . import distro +from . import path as utils_path log = logging.getLogger('avocado.test') diff --git a/avocado/utils/virt.py b/avocado/utils/virt.py index 134585bb8e7b2f2fe737e2bbc18520bbb7c2decd..2ce883b4d55d41391cfeee8bd9466db66d74d310 100644 --- a/avocado/utils/virt.py +++ b/avocado/utils/virt.py @@ -19,7 +19,7 @@ Module to provide classes for Virtual Machines. import logging from xml.dom import minidom -from avocado.utils import remote +from . import remote LOG = logging.getLogger('avocado.test')