ui: python2 requires relative imports

VUnit · Oct 21, 2019 · dad251c · dad251c
1 parent a46bd50
commit dad251c
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 39 deletions.
diff --git a/vunit/ui/common.py b/vunit/ui/common.py
@@ -10,7 +10,7 @@
 
 from os import environ
 from logging import getLogger
-from vunit.vhdl_standard import VHDL
+from ..vhdl_standard import VHDL
 
 
 LOGGER = getLogger(__name__)

diff --git a/vunit/ui/library.py b/vunit/ui/library.py
@@ -11,14 +11,14 @@
 from os.path import abspath
 from glob import glob
 from fnmatch import fnmatch
-from vunit.simulator_interface import is_string_not_iterable
-from vunit.source_file import file_type_of, FILE_TYPES, VERILOG_FILE_TYPES
-from vunit.builtins import add_verilog_include_dir
-
-from vunit.ui.common import check_not_empty
-from vunit.ui.source import SourceFile, SourceFileList
-from vunit.ui.testbench import TestBench
-from vunit.ui.packagefacade import PackageFacade
+from ..simulator_interface import is_string_not_iterable
+from ..source_file import file_type_of, FILE_TYPES, VERILOG_FILE_TYPES
+from ..builtins import add_verilog_include_dir
+
+from .common import check_not_empty
+from .source import SourceFile, SourceFileList
+from .testbench import TestBench
+from .packagefacade import PackageFacade
 
 
 class Library(object):

diff --git a/vunit/ui/packagefacade.py b/vunit/ui/packagefacade.py
@@ -9,7 +9,7 @@
 """
 
 from os.path import join, splitext
-from vunit.com import codec_generator
+from ..com import codec_generator
 
 
 class PackageFacade(object):

diff --git a/vunit/ui/source.py b/vunit/ui/source.py
@@ -8,7 +8,7 @@
 UI classes SourceFile and SourceFileList
 """
 
-from vunit import ostools
+from .. import ostools
 
 
 class SourceFileList(list):

diff --git a/vunit/ui/test.py b/vunit/ui/test.py
@@ -8,7 +8,7 @@
 UI class Test
 """
 
-from vunit.ui.common import lower_generics
+from .common import lower_generics
 
 
 class Test(object):

diff --git a/vunit/ui/testbench.py b/vunit/ui/testbench.py
@@ -9,8 +9,8 @@
 """
 
 from fnmatch import fnmatch
-from vunit.ui.common import lower_generics
-from vunit.ui.test import Test
+from .common import lower_generics
+from .test import Test
 
 
 class TestBench(object):

diff --git a/vunit/ui/vunit.py b/vunit/ui/vunit.py
@@ -20,31 +20,31 @@
 import os
 from os.path import exists, abspath, join, basename, normpath, dirname
 from fnmatch import fnmatch
-from vunit.database import PickledDataBase, DataBase
-from vunit import ostools
-from vunit.vunit_cli import VUnitCLI
-from vunit.simulator_factory import SIMULATOR_FACTORY
-from vunit.simulator_interface import SimulatorInterface
-from vunit.color_printer import COLOR_PRINTER, NO_COLOR_PRINTER
-
-from vunit.project import Project
-from vunit.test_runner import TestRunner
-from vunit.test_report import TestReport
-from vunit.test_bench_list import TestBenchList
-from vunit.exceptions import CompileError
-from vunit.location_preprocessor import LocationPreprocessor
-from vunit.check_preprocessor import CheckPreprocessor
-from vunit.parsing.encodings import HDL_FILE_ENCODING
-from vunit.builtins import Builtins
-from vunit.vhdl_standard import VHDL
-
-from vunit.ui.common import LOGGER, select_vhdl_standard, check_not_empty
-from vunit.ui.source import SourceFile, SourceFileList
-from vunit.ui.test import Test  # pylint: disable=unused-import
-from vunit.ui.testbench import TestBench  # pylint: disable=unused-import
-from vunit.ui.packagefacade import PackageFacade  # pylint: disable=unused-import
-from vunit.ui.library import Library
-from vunit.ui.results import Results
+from ..database import PickledDataBase, DataBase
+from .. import ostools
+from ..vunit_cli import VUnitCLI
+from ..simulator_factory import SIMULATOR_FACTORY
+from ..simulator_interface import SimulatorInterface
+from ..color_printer import COLOR_PRINTER, NO_COLOR_PRINTER
+
+from ..project import Project
+from ..test_runner import TestRunner
+from ..test_report import TestReport
+from ..test_bench_list import TestBenchList
+from ..exceptions import CompileError
+from ..location_preprocessor import LocationPreprocessor
+from ..check_preprocessor import CheckPreprocessor
+from ..parsing.encodings import HDL_FILE_ENCODING
+from ..builtins import Builtins
+from ..vhdl_standard import VHDL
+
+from .common import LOGGER, select_vhdl_standard, check_not_empty
+from .source import SourceFile, SourceFileList
+from .test import Test  # pylint: disable=unused-import
+from .testbench import TestBench  # pylint: disable=unused-import
+from .packagefacade import PackageFacade  # pylint: disable=unused-import
+from .library import Library
+from .results import Results
 
 
 class VUnit(  # pylint: disable=too-many-instance-attributes, too-many-public-methods