diff --git a/avocado/core/aexpect.py b/avocado/core/aexpect.py index 4f62a347ec92a5fdbe5c82df13c9421f91fc8b53..7814748f9647bc062d8f520b5a722ee70eead016 100755 --- a/avocado/core/aexpect.py +++ b/avocado/core/aexpect.py @@ -277,12 +277,12 @@ try: except ImportError: import subprocess -from avocado.utils import astring -from avocado.utils import data_factory -from avocado.utils import process -from avocado.utils import genio -from avocado.utils import wait -from avocado.utils import path as utils_path +from ..utils import astring +from ..utils import data_factory +from ..utils import process +from ..utils import genio +from ..utils import wait +from ..utils import path as utils_path class ExpectError(Exception): diff --git a/avocado/core/app.py b/avocado/core/app.py index d91aa45c6b75ab0ad0f489bf1769b668df934f45..3bfa7143470fcedb281602b6fdf7643c957b994a 100644 --- a/avocado/core/app.py +++ b/avocado/core/app.py @@ -18,9 +18,9 @@ The core Avocado application. import os -from avocado.core.log import configure -from avocado.core.parser import Parser -from avocado.core.plugins.manager import get_plugin_manager +from .log import configure +from .parser import Parser +from .plugins.manager import get_plugin_manager class AvocadoApp(object): diff --git a/avocado/core/data_dir.py b/avocado/core/data_dir.py index 8bb68fad192e0d3ec23c4bdaa64fb27fd12d952a..102700e199693d591e9fad868dd5ea555c307e03 100755 --- a/avocado/core/data_dir.py +++ b/avocado/core/data_dir.py @@ -33,10 +33,10 @@ import shutil import time import tempfile -from avocado.core import job_id -from avocado.core.settings import settings -from avocado.utils import path as utils_path -from avocado.utils.data_structures import Borg +from . import job_id +from .settings import settings +from ..utils import path as utils_path +from ..utils.data_structures import Borg _BASE_DIR = os.path.join(sys.modules[__name__].__file__, "..", "..", "..") diff --git a/avocado/core/job.py b/avocado/core/job.py index 16f11ee4ed3a8ea7deddc9dce0935a1cd2351d50..ed560d329d1d07bd2209034e1b84b3c56a748c09 100644 --- a/avocado/core/job.py +++ b/avocado/core/job.py @@ -27,26 +27,26 @@ import shutil import fnmatch from avocado import runtime -from avocado.core import data_dir -from avocado.core import runner -from avocado.core import loader -from avocado.core import sysinfo -from avocado.core import result -from avocado.core import exit_codes -from avocado.core import exceptions -from avocado.core import job_id -from avocado.core import output -from avocado.core import multiplexer -from avocado.core.settings import settings -from avocado.core.plugins import jsonresult -from avocado.core.plugins import xunit -from avocado.core.plugins.builtin import ErrorsLoading -from avocado.utils import archive -from avocado.utils import path +from . import data_dir +from . import runner +from . import loader +from . import sysinfo +from . import result +from . import exit_codes +from . import exceptions +from . import job_id +from . import output +from . import multiplexer +from .settings import settings +from .plugins import jsonresult +from .plugins import xunit +from .plugins.builtin import ErrorsLoading +from ..utils import archive +from ..utils import path try: - from avocado.core.plugins import htmlresult + from .plugins import htmlresult HTML_REPORT_SUPPORT = True except ImportError: HTML_REPORT_SUPPORT = False diff --git a/avocado/core/loader.py b/avocado/core/loader.py index 5efd7ab5d6e3b52177da26a02a334801be167d77..25bd914ed4ae862a87934a6c839c32067d559100 100644 --- a/avocado/core/loader.py +++ b/avocado/core/loader.py @@ -23,10 +23,10 @@ import os import re import sys -from avocado.core import data_dir -from avocado.core import test -from avocado.utils import path -from avocado.core import output +from . import data_dir +from . import test +from . import output +from ..utils import path try: import cStringIO as StringIO diff --git a/avocado/core/multiplexer.py b/avocado/core/multiplexer.py index e2014343c16d9cdcf2ba7e990a4327fbe4183cce..20b103e26947d4b78290e89a2c580cbba98e27f1 100644 --- a/avocado/core/multiplexer.py +++ b/avocado/core/multiplexer.py @@ -24,7 +24,7 @@ import itertools import logging import re -from avocado.core import tree +from . import tree MULTIPLEX_CAPABLE = tree.MULTIPLEX_CAPABLE diff --git a/avocado/core/output.py b/avocado/core/output.py index c4b4aed8846e7ae3b9c059ed912cd49b2fa47d8d..77178ba0412f7791b4d6407a541c6ca3dfec6c42 100644 --- a/avocado/core/output.py +++ b/avocado/core/output.py @@ -19,8 +19,8 @@ import logging import os import sys -from avocado.utils import path as utils_path -from avocado.core.settings import settings +from .settings import settings +from ..utils import path as utils_path class FilterError(logging.Filter): diff --git a/avocado/core/parser.py b/avocado/core/parser.py index 03191186b0029aeae1891efeb1fc276dcc27d407..f5fe1e4863be4ea6cb60b95e952853606d0135ba 100644 --- a/avocado/core/parser.py +++ b/avocado/core/parser.py @@ -20,8 +20,8 @@ Avocado application command line parsing. import sys import argparse -from avocado.core import tree -from avocado.core import settings +from . import tree +from . import settings from avocado.version import VERSION PROG = 'avocado' diff --git a/avocado/core/plugins/builtin.py b/avocado/core/plugins/builtin.py index 711974de1dae41162619969420e254e2af47f23e..1fbfdcec733dc49344b6071124a3d94645e73c5e 100644 --- a/avocado/core/plugins/builtin.py +++ b/avocado/core/plugins/builtin.py @@ -18,8 +18,8 @@ import os import logging from importlib import import_module -from avocado.core.plugins.plugin import Plugin -from avocado.core.settings import settings +from .plugin import Plugin +from ..settings import settings log = logging.getLogger("avocado.app") diff --git a/avocado/core/plugins/config.py b/avocado/core/plugins/config.py index 04e0dde5bb3578aea874bfcad14521a2e31d4c51..2eb14ba04a0c1dcee90950f1063659faffb7af7b 100644 --- a/avocado/core/plugins/config.py +++ b/avocado/core/plugins/config.py @@ -12,10 +12,10 @@ # Copyright: Red Hat Inc. 2013-2014 # Author: Lucas Meneghel Rodrigues -from avocado.core import output -from avocado.core import data_dir -from avocado.core.settings import settings -from avocado.core.plugins import plugin +from . import plugin +from .. import output +from .. import data_dir +from ..settings import settings class ConfigOptions(plugin.Plugin): diff --git a/avocado/core/plugins/distro.py b/avocado/core/plugins/distro.py index 0492b837b434a981cc1ca95d9dd776dc998b7e5f..8b4660773e6c9b3854fb056ea08200c24087500a 100644 --- a/avocado/core/plugins/distro.py +++ b/avocado/core/plugins/distro.py @@ -17,12 +17,12 @@ import bz2 import sys import json -from avocado.core import output -from avocado.core import exit_codes -from avocado.core.plugins import plugin -from avocado.utils import process -from avocado.utils import path as utils_path -from avocado.utils import distro as utils_distro +from . import plugin +from .. import output +from .. import exit_codes +from ...utils import process +from ...utils import path as utils_path +from ...utils import distro as utils_distro class SoftwarePackage(object): diff --git a/avocado/core/plugins/exec_path.py b/avocado/core/plugins/exec_path.py index 76f9754852465fe5dd827dc8b29f4ec6a2b167e9..8099c2aca48f16e638bdffcee28e8947e95724c6 100644 --- a/avocado/core/plugins/exec_path.py +++ b/avocado/core/plugins/exec_path.py @@ -17,8 +17,8 @@ Libexec PATHs modifier import os import sys -from avocado.core import exit_codes, output -from avocado.core.plugins import plugin +from . import plugin +from .. import exit_codes, output class ExecPath(plugin.Plugin): diff --git a/avocado/core/plugins/gdb.py b/avocado/core/plugins/gdb.py index 5fa028fb49f8610433a6a07e3fb517469b4e7ea4..dc2d64af93889f8c4c00ef4339dc07d074de3799 100644 --- a/avocado/core/plugins/gdb.py +++ b/avocado/core/plugins/gdb.py @@ -15,9 +15,9 @@ """Run tests with GDB goodies enabled.""" from avocado import runtime -from avocado.utils import path as utils_path -from avocado.core.plugins import plugin -from avocado.core.settings import settings +from . import plugin +from ..settings import settings +from ...utils import path as utils_path class GDB(plugin.Plugin): diff --git a/avocado/core/plugins/htmlresult.py b/avocado/core/plugins/htmlresult.py index e6bb028e05579be24f52171e9da41807bb664ddf..ac165d06b2dd189fa2e2a0ff6f76e810b5e13165 100644 --- a/avocado/core/plugins/htmlresult.py +++ b/avocado/core/plugins/htmlresult.py @@ -23,11 +23,11 @@ import subprocess import pystache from avocado import runtime -from avocado.core import exit_codes -from avocado.core import output -from avocado.core.result import TestResult -from avocado.utils import path as utils_path -from avocado.core.plugins import plugin +from . import plugin +from .. import exit_codes +from .. import output +from ..result import TestResult +from ...utils import path as utils_path class ReportModel(object): diff --git a/avocado/core/plugins/journal.py b/avocado/core/plugins/journal.py index bec605ccbb88572066cb0bd142cee60bf0385a72..4a3e7f80b8df272b18e270e830bd0466ed9f8e19 100644 --- a/avocado/core/plugins/journal.py +++ b/avocado/core/plugins/journal.py @@ -18,8 +18,8 @@ import os import sqlite3 import datetime -from avocado.core.plugins import plugin -from avocado.core.result import TestResult +from . import plugin +from ..result import TestResult JOURNAL_FILENAME = ".journal.sqlite" diff --git a/avocado/core/plugins/jsonresult.py b/avocado/core/plugins/jsonresult.py index 2a6b7cf010b33b44b2244ba26aefd7feb572679b..ea0faf47ac149b4c1e4b3c69f0fcbeca2d77925c 100644 --- a/avocado/core/plugins/jsonresult.py +++ b/avocado/core/plugins/jsonresult.py @@ -18,9 +18,9 @@ JSON output module. import json -from avocado.core import output -from avocado.core.result import TestResult -from avocado.core.plugins import plugin +from . import plugin +from .. import output +from ..result import TestResult class JSONTestResult(TestResult): diff --git a/avocado/core/plugins/manager.py b/avocado/core/plugins/manager.py index 9cab0d1a868b042c84e656bb6215ab8d12281e3f..2922289a047bd46567cf50aabab1b8118659dce8 100644 --- a/avocado/core/plugins/manager.py +++ b/avocado/core/plugins/manager.py @@ -16,8 +16,8 @@ import logging -from avocado.core.plugins.builtin import load_builtins -from avocado.core.plugins.plugin import Plugin +from .builtin import load_builtins +from .plugin import Plugin DefaultPluginManager = None diff --git a/avocado/core/plugins/multiplexer.py b/avocado/core/plugins/multiplexer.py index 24cdf326e03bc5cf4e44c3b284a4f8301956e592..5d66662eff86de94352afe57dd03d447196c65cb 100644 --- a/avocado/core/plugins/multiplexer.py +++ b/avocado/core/plugins/multiplexer.py @@ -14,11 +14,11 @@ import sys -from avocado.core.plugins import plugin -from avocado.core import output -from avocado.core import exit_codes -from avocado.core import tree -from avocado.core import multiplexer +from . import plugin +from .. import output +from .. import exit_codes +from .. import tree +from .. import multiplexer class Multiplexer(plugin.Plugin): diff --git a/avocado/core/plugins/plugin_list.py b/avocado/core/plugins/plugin_list.py index 930fc3ef4a6b5921114ea3994508ff6fb5aac52f..a4874f2b0140f74895cf960b0e55b3c979ec7aa3 100644 --- a/avocado/core/plugins/plugin_list.py +++ b/avocado/core/plugins/plugin_list.py @@ -12,10 +12,10 @@ # Copyright: Red Hat Inc. 2013-2014 # Author: Ruda Moura -from avocado.core import output -from avocado.core.plugins import plugin -from avocado.core.plugins.builtin import ErrorsLoading -from avocado.core.plugins.manager import get_plugin_manager +from . import plugin +from .builtin import ErrorsLoading +from .manager import get_plugin_manager +from .. import output class PluginList(plugin.Plugin): diff --git a/avocado/core/plugins/remote.py b/avocado/core/plugins/remote.py index 89e7ea4f65befdfa9dbf30748fa33054f226d290..446fba97a3c71fee4062430ec2d5998e002986c0 100644 --- a/avocado/core/plugins/remote.py +++ b/avocado/core/plugins/remote.py @@ -16,10 +16,10 @@ import getpass -from avocado.core.plugins import plugin -from avocado.core.remote import RemoteTestResult -from avocado.core.remote import RemoteTestRunner -from avocado.utils import remote +from . import plugin +from ..remote import RemoteTestResult +from ..remote import RemoteTestRunner +from ...utils import remote class RunRemote(plugin.Plugin): @@ -78,7 +78,7 @@ class RunRemote(plugin.Plugin): if not getattr(app_args, arg): missing.append(arg) if missing: - from avocado.core import output, exit_codes + from .. import output, exit_codes import sys view = output.View(app_args=app_args) e_msg = ('Use of %s requires %s arguments to be set. Please set %s' diff --git a/avocado/core/plugins/runner.py b/avocado/core/plugins/runner.py index 1eb75acd5920c9465330d1d0cef60d407bb11ab2..2478b8c759aa690e6f875ed0ef2e796830c96e41 100644 --- a/avocado/core/plugins/runner.py +++ b/avocado/core/plugins/runner.py @@ -18,12 +18,12 @@ Base Test Runner Plugins. import sys -from avocado.core.settings import settings -from avocado.core import exit_codes -from avocado.core.plugins import plugin -from avocado.core import output -from avocado.core import job -from avocado.core import multiplexer +from . import plugin +from .. import exit_codes +from .. import output +from .. import job +from .. import multiplexer +from ..settings import settings class TestRunner(plugin.Plugin): diff --git a/avocado/core/plugins/sysinfo.py b/avocado/core/plugins/sysinfo.py index 7c32c236dae5abcef68cf9188cb39a7fb58a4787..bcb075a5bf374d3e4144cd67befbdc507c8c8e42 100644 --- a/avocado/core/plugins/sysinfo.py +++ b/avocado/core/plugins/sysinfo.py @@ -15,8 +15,8 @@ System information plugin """ -from avocado.core import sysinfo -from avocado.core.plugins import plugin +from . import plugin +from .. import sysinfo class SystemInformation(plugin.Plugin): diff --git a/avocado/core/plugins/test_list.py b/avocado/core/plugins/test_list.py index fab4121e1ee68daca98b8c35fb405a109f1acbaa..026ffd1c142f178c6ef4b423117fd9df35cf15d6 100644 --- a/avocado/core/plugins/test_list.py +++ b/avocado/core/plugins/test_list.py @@ -14,12 +14,12 @@ import sys -from avocado.core import test -from avocado.core import loader -from avocado.core import output -from avocado.core import exit_codes -from avocado.utils import astring -from avocado.core.plugins import plugin +from . import plugin +from .. import test +from .. import loader +from .. import output +from .. import exit_codes +from ...utils import astring class TestLister(object): diff --git a/avocado/core/plugins/vm.py b/avocado/core/plugins/vm.py index d8b1871011b087d6520f62c1da02f5d732de7ad5..25f4cd341d6a39027bc91ad77eb89d869ed46c7f 100644 --- a/avocado/core/plugins/vm.py +++ b/avocado/core/plugins/vm.py @@ -16,10 +16,10 @@ import getpass -from avocado.core.plugins import plugin -from avocado.core.remote import VMTestResult -from avocado.core.remote import RemoteTestRunner -from avocado.utils import virt +from . import plugin +from ..remote import VMTestResult +from ..remote import RemoteTestRunner +from ...utils import virt class RunVM(plugin.Plugin): @@ -83,7 +83,7 @@ class RunVM(plugin.Plugin): if not getattr(app_args, arg): missing.append(arg) if missing: - from avocado.core import output, exit_codes + from .. import output, exit_codes import sys view = output.View(app_args=app_args) e_msg = ('Use of %s requires %s arguments to be set. Please set %s' diff --git a/avocado/core/plugins/wrapper.py b/avocado/core/plugins/wrapper.py index b3ba74f6576b7763459995219577e9ae5031b5ed..28015726aa3bd6341d6ab6a4db4534323c7abbba 100644 --- a/avocado/core/plugins/wrapper.py +++ b/avocado/core/plugins/wrapper.py @@ -15,10 +15,10 @@ import os import sys +from . import plugin +from .. import exit_codes +from .. import output from avocado import runtime -from avocado.core import exit_codes -from avocado.core import output -from avocado.core.plugins import plugin class Wrapper(plugin.Plugin): diff --git a/avocado/core/plugins/xunit.py b/avocado/core/plugins/xunit.py index 8988e6c4d0c7e8493e7f27efcfb934c407fa3c91..20bd83f05e3d60f65362e81579615364e20b6ccc 100644 --- a/avocado/core/plugins/xunit.py +++ b/avocado/core/plugins/xunit.py @@ -17,9 +17,9 @@ import datetime from xml.sax.saxutils import quoteattr -from avocado.core import output -from avocado.core.result import TestResult -from avocado.core.plugins import plugin +from . import plugin +from .. import output +from ..result import TestResult # We use a subset of the XML format defined in this URL: diff --git a/avocado/core/remote/__init__.py b/avocado/core/remote/__init__.py index fcad0cf710ff48a374a5b55d840b262c7394e638..f8c9fe2a9587aa4a72b8ead64d3bda40330b814a 100644 --- a/avocado/core/remote/__init__.py +++ b/avocado/core/remote/__init__.py @@ -12,6 +12,6 @@ # Copyright: Red Hat Inc. 2014-2015 # Author: Ruda Moura -from avocado.core.remote.test import RemoteTest -from avocado.core.remote.result import RemoteTestResult, VMTestResult -from avocado.core.remote.runner import RemoteTestRunner +from .test import RemoteTest +from .result import RemoteTestResult, VMTestResult +from .runner import RemoteTestRunner diff --git a/avocado/core/remote/result.py b/avocado/core/remote/result.py index b0616aa59c9ec96d22e802d003fb1b69e0cbc9f7..feaf4bb49a9b48f3361f066e4c1dde3d355fa5a8 100644 --- a/avocado/core/remote/result.py +++ b/avocado/core/remote/result.py @@ -16,11 +16,11 @@ import os -from avocado.core import data_dir -from avocado.core import exceptions -from avocado.core.result import HumanTestResult -from avocado.utils import remote -from avocado.utils import virt +from .. import data_dir +from .. import exceptions +from ..result import HumanTestResult +from ...utils import remote +from ...utils import virt class RemoteTestResult(HumanTestResult): diff --git a/avocado/core/remote/runner.py b/avocado/core/remote/runner.py index 4e9ded3242c19a8d4a0834ba33ea13e6f9b11c81..fdd6c7e44a45bf45b0188c893cd784b7e52acc54 100644 --- a/avocado/core/remote/runner.py +++ b/avocado/core/remote/runner.py @@ -18,12 +18,12 @@ import json import os import re -from avocado.core import exceptions -from avocado.core import status -from avocado.core.runner import TestRunner -from avocado.core.remote.test import RemoteTest -from avocado.utils import archive -from avocado.utils import stacktrace +from .test import RemoteTest +from .. import exceptions +from .. import status +from ..runner import TestRunner +from ...utils import archive +from ...utils import stacktrace from fabric.exceptions import CommandTimeout diff --git a/avocado/core/restclient/cli/actions/server.py b/avocado/core/restclient/cli/actions/server.py index 80ecf4c6abdcd2114dadc1377daf72d3b1f528f9..d7f1d74b4827df2c9ebbebcdcf5d1d23a72b726c 100644 --- a/avocado/core/restclient/cli/actions/server.py +++ b/avocado/core/restclient/cli/actions/server.py @@ -6,8 +6,8 @@ Module that implements the actions for the CLI App when the job toplevel command is used """ -from avocado.core.restclient import connection -from avocado.core.restclient.cli.actions import base +from . import base +from ... import connection @base.action diff --git a/avocado/core/restclient/cli/app.py b/avocado/core/restclient/cli/app.py index d35ef4fb3de4b448771850b4f6fdbb894d44331a..f9f1f0cfc9311277bf20c4c86ff9d7d17a8ea7f2 100644 --- a/avocado/core/restclient/cli/app.py +++ b/avocado/core/restclient/cli/app.py @@ -22,11 +22,12 @@ import types import importlib import functools -from avocado.core import settings -from avocado.core import output -from avocado.core import exit_codes -from avocado.core.restclient import connection -from avocado.core.restclient.cli import parser +from . import parser +from .. import connection +from ... import settings +from ... import output +from ... import exit_codes + __all__ = ['App'] diff --git a/avocado/core/restclient/cli/args/server.py b/avocado/core/restclient/cli/args/server.py index a2e2bef76e8028ca9bda2ae5425a9a3683cdde4c..c8c1136d70315abb325bdafae590e7f08c67dc64 100644 --- a/avocado/core/restclient/cli/args/server.py +++ b/avocado/core/restclient/cli/args/server.py @@ -16,7 +16,7 @@ This module has actions for the server command """ -from avocado.core.restclient.cli.args import base +from . import base __all__ = ['ACTION_STATUS', 'ACTION_ARGUMENTS', 'ARGUMENTS'] diff --git a/avocado/core/restclient/connection.py b/avocado/core/restclient/connection.py index 19208e5ca2ce749c3f1387824b3fefc4e60fbcbe..6df75be7ad1a55a10157bbf1af16c66b5388d6ba 100644 --- a/avocado/core/restclient/connection.py +++ b/avocado/core/restclient/connection.py @@ -21,7 +21,7 @@ basic object that allows methods to be called on the remote server. import requests -from avocado.core.settings import settings +from ..settings import settings __all__ = ['get_default', 'Connection'] diff --git a/avocado/core/runner.py b/avocado/core/runner.py index 526ecc3b80c42e9f0c206ae64d8135a57a438bf7..529e35d89e0b4c985b4427a673f50baacbfca7c8 100644 --- a/avocado/core/runner.py +++ b/avocado/core/runner.py @@ -26,13 +26,13 @@ import sys import time from avocado import runtime -from avocado.core import test -from avocado.core import exceptions -from avocado.core import output -from avocado.core import status -from avocado.core import exit_codes -from avocado.utils import wait -from avocado.utils import stacktrace +from . import test +from . import exceptions +from . import output +from . import status +from . import exit_codes +from ..utils import wait +from ..utils import stacktrace class TestRunner(object): diff --git a/avocado/core/settings.py b/avocado/core/settings.py index 459f684b5cea963d9575324ab5426555eaf13640..96a9e02984bd3534ca76c6ccc8e5ebe834e32de0 100644 --- a/avocado/core/settings.py +++ b/avocado/core/settings.py @@ -21,7 +21,7 @@ import os import sys import glob -from avocado.utils import path +from ..utils import path if 'VIRTUAL_ENV' in os.environ: diff --git a/avocado/core/sysinfo.py b/avocado/core/sysinfo.py index bfb77f50ea21411d797a36241510473cc76faeac..d3f66167fdf86df468ac6ab5541f828a72913fcb 100644 --- a/avocado/core/sysinfo.py +++ b/avocado/core/sysinfo.py @@ -23,12 +23,12 @@ try: except ImportError: import subprocess -from avocado.utils import genio -from avocado.utils import process -from avocado.utils import software_manager -from avocado.utils import path as utils_path -from avocado.core import output -from avocado.core.settings import settings +from . import output +from .settings import settings +from ..utils import genio +from ..utils import process +from ..utils import software_manager +from ..utils import path as utils_path log = logging.getLogger("avocado.sysinfo") diff --git a/avocado/core/test.py b/avocado/core/test.py index 894997c3d055990b76f5a372561d99292feb1fea..32cce688a88861b471dfafbf2c13e71cd1f64986 100644 --- a/avocado/core/test.py +++ b/avocado/core/test.py @@ -31,14 +31,14 @@ if sys.version_info[:2] == (2, 6): else: import unittest -from avocado.core import data_dir -from avocado.core import sysinfo -from avocado.core import exceptions -from avocado.core import multiplexer -from avocado.utils import genio -from avocado.utils import path as utils_path -from avocado.utils import process -from avocado.utils import stacktrace +from . import data_dir +from . import sysinfo +from . import exceptions +from . import multiplexer +from ..utils import genio +from ..utils import path as utils_path +from ..utils import process +from ..utils import stacktrace from avocado.version import VERSION diff --git a/avocado/core/tree.py b/avocado/core/tree.py index 5b23916ecf136318702f76c212ad30e184842daa..445b1fb5892e402890b3008ef06403777bcc6c5d 100644 --- a/avocado/core/tree.py +++ b/avocado/core/tree.py @@ -49,7 +49,7 @@ else: except ImportError: from yaml import Loader -from avocado.core import output +from . import output # Mapping for yaml flags YAML_INCLUDE = 0