diff options
| author | Patrick Lehmann <Patrick.Lehmann@plc2.de> | 2020-12-29 00:46:41 +0100 |
|---|---|---|
| committer | Patrick Lehmann <Patrick.Lehmann@plc2.de> | 2020-12-29 00:46:41 +0100 |
| commit | 71a7c3b1102b888f0560de64d9efaa48d8a3738f (patch) | |
| tree | ca962a679bf3406195da6be6b6a28b26f60a819f | |
| parent | 9e991938ae1f0ad188ce33f73c51b1c9d4354589 (diff) | |
| download | ghdl-71a7c3b1102b888f0560de64d9efaa48d8a3738f.tar.gz ghdl-71a7c3b1102b888f0560de64d9efaa48d8a3738f.tar.bz2 ghdl-71a7c3b1102b888f0560de64d9efaa48d8a3738f.zip | |
Fixed package names in pyGHDL.dom and Initialize test case.
| -rw-r--r-- | pyGHDL/dom/Common.py | 4 | ||||
| -rw-r--r-- | pyGHDL/dom/DesignUnit.py | 5 | ||||
| -rw-r--r-- | pyGHDL/dom/Misc.py | 6 | ||||
| -rw-r--r-- | testsuite/pyunit/libghdl/Initialize.py | 15 |
4 files changed, 14 insertions, 16 deletions
diff --git a/pyGHDL/dom/Common.py b/pyGHDL/dom/Common.py index 8baa6537e..0cd41c99e 100644 --- a/pyGHDL/dom/Common.py +++ b/pyGHDL/dom/Common.py @@ -2,8 +2,8 @@ from pydecor import export from pyVHDLModel.VHDLModel import Modes -from libghdl.thin import name_table -from libghdl.thin.vhdl import nodes +from pyGHDL.libghdl import name_table +from pyGHDL.libghdl.vhdl import nodes __all__ = [] __api__ = __all__ diff --git a/pyGHDL/dom/DesignUnit.py b/pyGHDL/dom/DesignUnit.py index 894651c2c..3e87bb41a 100644 --- a/pyGHDL/dom/DesignUnit.py +++ b/pyGHDL/dom/DesignUnit.py @@ -7,9 +7,10 @@ from pyVHDLModel.VHDLModel import PackageBody as VHDLModel_PackageBody from pyVHDLModel.VHDLModel import Context as VHDLModel_Context from pyVHDLModel.VHDLModel import Configuration as VHDLModel_Configuration -from libghdl.thin.vhdl import nodes, pyutils +from pyGHDL.libghdl.vhdl import nodes +import pyGHDL.libghdl.utils as pyutils -from pyGHDL.dom.Common import GHDLMixin +from pyGHDL.dom.Common import GHDLMixin __all__ = [] __api__ = __all__ diff --git a/pyGHDL/dom/Misc.py b/pyGHDL/dom/Misc.py index 8493028de..af8c6247a 100644 --- a/pyGHDL/dom/Misc.py +++ b/pyGHDL/dom/Misc.py @@ -7,9 +7,9 @@ from pyVHDLModel.VHDLModel import Design as VHDLModel_Design from pyVHDLModel.VHDLModel import Library as VHDLModel_Library from pyVHDLModel.VHDLModel import Document as VHDLModel_Document -import libghdl -from libghdl.thin import name_table, files_map, errorout_console -from libghdl.thin.vhdl import nodes, sem_lib +import pyGHDL.libghdl as libghdl +from pyGHDL.libghdl import name_table, files_map, errorout_console +from pyGHDL.libghdl.vhdl import nodes, sem_lib from pyGHDL.dom.Common import LibGHDLException, GHDLException from pyGHDL.dom.DesignUnit import Entity, Architecture, Package, PackageBody, Context, Configuration diff --git a/testsuite/pyunit/libghdl/Initialize.py b/testsuite/pyunit/libghdl/Initialize.py index 90692760c..7ad00a995 100644 --- a/testsuite/pyunit/libghdl/Initialize.py +++ b/testsuite/pyunit/libghdl/Initialize.py @@ -1,12 +1,9 @@ -from pathlib import Path -from unittest import TestCase - -import libghdl -from libghdl.thin import name_table -from libghdl.thin import files_map -from libghdl.thin.vhdl import nodes -from libghdl.thin.vhdl import sem_lib -from libghdl.thin import errorout_console +from pathlib import Path +from unittest import TestCase + +import pyGHDL.libghdl as libghdl +from pyGHDL.libghdl import name_table, files_map, errorout_console +from pyGHDL.libghdl.vhdl import nodes, sem_lib if __name__ == "__main__": |