aboutsummaryrefslogtreecommitdiffstats
path: root/pyGHDL/libghdl
diff options
context:
space:
mode:
authorPatrick Lehmann <Patrick.Lehmann@plc2.de>2021-12-12 14:35:51 +0100
committerPatrick Lehmann <Patrick.Lehmann@plc2.de>2021-12-12 14:50:05 +0100
commit03836b00aeddca2fd73f078d7850dc58be632466 (patch)
treec58ec03330d2bddd1c55cd81e3bfc81016139b3b /pyGHDL/libghdl
parentf7b6325cb2b4ba5f722b5dceb3b36737a94fba47 (diff)
downloadghdl-03836b00aeddca2fd73f078d7850dc58be632466.tar.gz
ghdl-03836b00aeddca2fd73f078d7850dc58be632466.tar.bz2
ghdl-03836b00aeddca2fd73f078d7850dc58be632466.zip
Changed export decorator from pydecor to pyTooling.Decorators
Diffstat (limited to 'pyGHDL/libghdl')
-rw-r--r--pyGHDL/libghdl/__init__.py10
-rw-r--r--pyGHDL/libghdl/_decorator.py2
-rw-r--r--pyGHDL/libghdl/_types.py2
-rw-r--r--pyGHDL/libghdl/errorout.py2
-rw-r--r--pyGHDL/libghdl/errorout_console.py2
-rw-r--r--pyGHDL/libghdl/errorout_memory.py2
-rw-r--r--pyGHDL/libghdl/files_map.py2
-rw-r--r--pyGHDL/libghdl/files_map_editor.py2
-rw-r--r--pyGHDL/libghdl/libraries.py2
-rw-r--r--pyGHDL/libghdl/name_table.py2
-rw-r--r--pyGHDL/libghdl/requirements.txt2
-rw-r--r--pyGHDL/libghdl/std_names.py2
-rw-r--r--pyGHDL/libghdl/str_table.py2
-rw-r--r--pyGHDL/libghdl/utils.py2
-rw-r--r--pyGHDL/libghdl/version.py1
-rw-r--r--pyGHDL/libghdl/vhdl/elocations.py2
-rw-r--r--pyGHDL/libghdl/vhdl/flists.py2
-rw-r--r--pyGHDL/libghdl/vhdl/formatters.py2
-rw-r--r--pyGHDL/libghdl/vhdl/lists.py2
-rw-r--r--pyGHDL/libghdl/vhdl/nodes.py2
-rw-r--r--pyGHDL/libghdl/vhdl/nodes_meta.py2
-rw-r--r--pyGHDL/libghdl/vhdl/nodes_utils.py2
-rw-r--r--pyGHDL/libghdl/vhdl/parse.py2
-rw-r--r--pyGHDL/libghdl/vhdl/scanner.py2
-rw-r--r--pyGHDL/libghdl/vhdl/sem.py2
-rw-r--r--pyGHDL/libghdl/vhdl/sem_lib.py2
-rw-r--r--pyGHDL/libghdl/vhdl/tokens.py2
-rw-r--r--pyGHDL/libghdl/vhdl/utils.py2
28 files changed, 31 insertions, 32 deletions
diff --git a/pyGHDL/libghdl/__init__.py b/pyGHDL/libghdl/__init__.py
index 04cc387d9..372f5968b 100644
--- a/pyGHDL/libghdl/__init__.py
+++ b/pyGHDL/libghdl/__init__.py
@@ -38,13 +38,13 @@ from pathlib import Path
from shutil import which
from typing import List, Optional
-from pydecor import export
+from pyTooling.Decorators import export
from pyGHDL import GHDLBaseException
from pyGHDL.libghdl._types import Iir
# from pyGHDL.libghdl._decorator import BindToLibGHDL
-from pyGHDL.libghdl.version import __version__
+from pyGHDL import __version__ as ghdlVersion
Nullable = Optional
@@ -63,9 +63,9 @@ class LibGHDLException(GHDLBaseException):
def _get_libghdl_name() -> Path:
"""Get the name of the libghdl library (with version and extension)."""
- ver = __version__.replace("-", "_").replace(".", "_")
+ version = ghdlVersion.replace("-", "_").replace(".", "_")
ext = {"win32": "dll", "cygwin": "dll", "msys": "dll", "darwin": "dylib"}.get(sys_platform, "so")
- return Path("libghdl-{version}.{ext}".format(version=ver, ext=ext))
+ return Path(f"libghdl-{version}.{ext}")
def _check_libghdl_libdir(libdir: Path, basename: Path) -> Path:
@@ -140,7 +140,7 @@ def _get_libghdl_path():
pass
# Failed.
- raise Exception("Cannot find libghdl {}".format(basename))
+ raise Exception(f"Cannot find libghdl {basename}")
def _initialize():
diff --git a/pyGHDL/libghdl/_decorator.py b/pyGHDL/libghdl/_decorator.py
index 32a02930d..49694e8a3 100644
--- a/pyGHDL/libghdl/_decorator.py
+++ b/pyGHDL/libghdl/_decorator.py
@@ -46,7 +46,7 @@ from enum import IntEnum
from functools import wraps
from typing import Callable, List, Dict, Any, TypeVar
-from pydecor import export
+from pyTooling.Decorators import export
from pyGHDL.libghdl import libghdl, LibGHDLException
diff --git a/pyGHDL/libghdl/_types.py b/pyGHDL/libghdl/_types.py
index b3d4c92bb..a7247a0fd 100644
--- a/pyGHDL/libghdl/_types.py
+++ b/pyGHDL/libghdl/_types.py
@@ -31,7 +31,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# ============================================================================
from enum import IntEnum, unique
-from pydecor import export
+from pyTooling.Decorators import export
from ctypes import c_int32, c_uint32, c_int64, c_double, c_bool
from typing import TypeVar
diff --git a/pyGHDL/libghdl/errorout.py b/pyGHDL/libghdl/errorout.py
index 4cdcdee56..5aa8de1c8 100644
--- a/pyGHDL/libghdl/errorout.py
+++ b/pyGHDL/libghdl/errorout.py
@@ -2,7 +2,7 @@
# Call 'make' in 'src/vhdl' to regenerate:
#
from enum import IntEnum, unique
-from pydecor import export
+from pyTooling.Decorators import export
from pyGHDL.libghdl._decorator import BindToLibGHDL
diff --git a/pyGHDL/libghdl/errorout_console.py b/pyGHDL/libghdl/errorout_console.py
index bb24079e1..826458a38 100644
--- a/pyGHDL/libghdl/errorout_console.py
+++ b/pyGHDL/libghdl/errorout_console.py
@@ -32,7 +32,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# ============================================================================
-from pydecor import export
+from pyTooling.Decorators import export
from pyGHDL.libghdl._decorator import BindToLibGHDL
diff --git a/pyGHDL/libghdl/errorout_memory.py b/pyGHDL/libghdl/errorout_memory.py
index 3f85a03c9..bf60c53bb 100644
--- a/pyGHDL/libghdl/errorout_memory.py
+++ b/pyGHDL/libghdl/errorout_memory.py
@@ -34,7 +34,7 @@
from ctypes import c_int8, c_int32, c_char_p, Structure
-from pydecor import export
+from pyTooling.Decorators import export
from pyGHDL.libghdl._types import ErrorIndex
from pyGHDL.libghdl._decorator import BindToLibGHDL
diff --git a/pyGHDL/libghdl/files_map.py b/pyGHDL/libghdl/files_map.py
index 277a00706..8f8cdf02c 100644
--- a/pyGHDL/libghdl/files_map.py
+++ b/pyGHDL/libghdl/files_map.py
@@ -32,7 +32,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# ============================================================================
-from pydecor import export
+from pyTooling.Decorators import export
from pyGHDL.libghdl._decorator import BindToLibGHDL
from pyGHDL.libghdl._types import NameId, SourceFileEntry, LocationType
diff --git a/pyGHDL/libghdl/files_map_editor.py b/pyGHDL/libghdl/files_map_editor.py
index 9afd46bdc..a67766c44 100644
--- a/pyGHDL/libghdl/files_map_editor.py
+++ b/pyGHDL/libghdl/files_map_editor.py
@@ -34,7 +34,7 @@
from ctypes import c_int32, c_char_p, c_bool, c_uint32
-from pydecor import export
+from pyTooling.Decorators import export
from pyGHDL.libghdl import libghdl
from pyGHDL.libghdl._decorator import BindToLibGHDL
diff --git a/pyGHDL/libghdl/libraries.py b/pyGHDL/libghdl/libraries.py
index 06b5f044c..fe09fa920 100644
--- a/pyGHDL/libghdl/libraries.py
+++ b/pyGHDL/libghdl/libraries.py
@@ -34,7 +34,7 @@
from ctypes import c_int32
-from pydecor import export
+from pyTooling.Decorators import export
from pyGHDL.libghdl import libghdl
from pyGHDL.libghdl._types import (
diff --git a/pyGHDL/libghdl/name_table.py b/pyGHDL/libghdl/name_table.py
index 8718982af..b29775213 100644
--- a/pyGHDL/libghdl/name_table.py
+++ b/pyGHDL/libghdl/name_table.py
@@ -34,7 +34,7 @@
#
from ctypes import c_char, c_char_p
-from pydecor import export
+from pyTooling.Decorators import export
from pyGHDL.libghdl._types import NameId
from pyGHDL.libghdl._decorator import BindToLibGHDL
diff --git a/pyGHDL/libghdl/requirements.txt b/pyGHDL/libghdl/requirements.txt
index b0f362aea..538e15ba4 100644
--- a/pyGHDL/libghdl/requirements.txt
+++ b/pyGHDL/libghdl/requirements.txt
@@ -1 +1 @@
-pydecor>=2.0.1
+pyTooling>=1.5.1
diff --git a/pyGHDL/libghdl/std_names.py b/pyGHDL/libghdl/std_names.py
index 098e2b34e..e6339520f 100644
--- a/pyGHDL/libghdl/std_names.py
+++ b/pyGHDL/libghdl/std_names.py
@@ -1,7 +1,7 @@
# Auto generated Python source file from Ada sources
# Call 'make' in 'src/vhdl' to regenerate:
#
-from pydecor import export
+from pyTooling.Decorators import export
@export
diff --git a/pyGHDL/libghdl/str_table.py b/pyGHDL/libghdl/str_table.py
index f87e9db8b..a91268bb4 100644
--- a/pyGHDL/libghdl/str_table.py
+++ b/pyGHDL/libghdl/str_table.py
@@ -34,7 +34,7 @@
#
from ctypes import c_char_p
-from pydecor import export
+from pyTooling.Decorators import export
from pyGHDL.libghdl._types import String8Id
from pyGHDL.libghdl._decorator import BindToLibGHDL
diff --git a/pyGHDL/libghdl/utils.py b/pyGHDL/libghdl/utils.py
index 98e350e03..5fc62af91 100644
--- a/pyGHDL/libghdl/utils.py
+++ b/pyGHDL/libghdl/utils.py
@@ -34,7 +34,7 @@
from ctypes import byref
from typing import List, Any, Generator
-from pydecor import export
+from pyTooling.Decorators import export
from pyGHDL.libghdl._decorator import EnumLookupTable
from pyGHDL.libghdl._types import NameId
diff --git a/pyGHDL/libghdl/version.py b/pyGHDL/libghdl/version.py
deleted file mode 100644
index eb436f1c7..000000000
--- a/pyGHDL/libghdl/version.py
+++ /dev/null
@@ -1 +0,0 @@
-__version__ = "2.0.0-dev"
diff --git a/pyGHDL/libghdl/vhdl/elocations.py b/pyGHDL/libghdl/vhdl/elocations.py
index dd3600ecf..e7282adb6 100644
--- a/pyGHDL/libghdl/vhdl/elocations.py
+++ b/pyGHDL/libghdl/vhdl/elocations.py
@@ -1,7 +1,7 @@
# Auto generated Python source file from Ada sources
# Call 'make' in 'src/vhdl' to regenerate:
#
-from pydecor import export
+from pyTooling.Decorators import export
from pyGHDL.libghdl import libghdl
diff --git a/pyGHDL/libghdl/vhdl/flists.py b/pyGHDL/libghdl/vhdl/flists.py
index 9d5b7fdb7..c62296307 100644
--- a/pyGHDL/libghdl/vhdl/flists.py
+++ b/pyGHDL/libghdl/vhdl/flists.py
@@ -33,7 +33,7 @@
# ============================================================================
from ctypes import c_int32
-from pydecor import export
+from pyTooling.Decorators import export
from pyGHDL.libghdl._decorator import BindToLibGHDL
diff --git a/pyGHDL/libghdl/vhdl/formatters.py b/pyGHDL/libghdl/vhdl/formatters.py
index 72b72010e..90022320e 100644
--- a/pyGHDL/libghdl/vhdl/formatters.py
+++ b/pyGHDL/libghdl/vhdl/formatters.py
@@ -34,7 +34,7 @@
from ctypes import c_int32, c_char_p
-from pydecor import export
+from pyTooling.Decorators import export
from pyGHDL.libghdl import libghdl
from pyGHDL.libghdl._decorator import BindToLibGHDL
diff --git a/pyGHDL/libghdl/vhdl/lists.py b/pyGHDL/libghdl/vhdl/lists.py
index 6f8370a09..cc37e2dd8 100644
--- a/pyGHDL/libghdl/vhdl/lists.py
+++ b/pyGHDL/libghdl/vhdl/lists.py
@@ -34,7 +34,7 @@
from ctypes import c_int32, c_bool, POINTER, Structure
-from pydecor import export
+from pyTooling.Decorators import export
from pyGHDL.libghdl import libghdl
from pyGHDL.libghdl._decorator import BindToLibGHDL
diff --git a/pyGHDL/libghdl/vhdl/nodes.py b/pyGHDL/libghdl/vhdl/nodes.py
index 0ed86c49b..45b6d1ee6 100644
--- a/pyGHDL/libghdl/vhdl/nodes.py
+++ b/pyGHDL/libghdl/vhdl/nodes.py
@@ -2,7 +2,7 @@
# Call 'make' in 'src/vhdl' to regenerate:
#
from enum import IntEnum, unique
-from pydecor import export
+from pyTooling.Decorators import export
from pyGHDL.libghdl._decorator import BindToLibGHDL
diff --git a/pyGHDL/libghdl/vhdl/nodes_meta.py b/pyGHDL/libghdl/vhdl/nodes_meta.py
index 726d885be..4602d0ac2 100644
--- a/pyGHDL/libghdl/vhdl/nodes_meta.py
+++ b/pyGHDL/libghdl/vhdl/nodes_meta.py
@@ -2,7 +2,7 @@
# Call 'make' in 'src/vhdl' to regenerate:
#
from enum import IntEnum, unique
-from pydecor import export
+from pyTooling.Decorators import export
from pyGHDL.libghdl._decorator import BindToLibGHDL
diff --git a/pyGHDL/libghdl/vhdl/nodes_utils.py b/pyGHDL/libghdl/vhdl/nodes_utils.py
index 31d495d85..2871fab62 100644
--- a/pyGHDL/libghdl/vhdl/nodes_utils.py
+++ b/pyGHDL/libghdl/vhdl/nodes_utils.py
@@ -32,7 +32,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# ============================================================================
-from pydecor import export
+from pyTooling.Decorators import export
from pyGHDL.libghdl._types import Iir
from pyGHDL.libghdl._decorator import BindToLibGHDL
diff --git a/pyGHDL/libghdl/vhdl/parse.py b/pyGHDL/libghdl/vhdl/parse.py
index a61cdfef7..7c59d0df7 100644
--- a/pyGHDL/libghdl/vhdl/parse.py
+++ b/pyGHDL/libghdl/vhdl/parse.py
@@ -34,7 +34,7 @@
from ctypes import c_bool
-from pydecor import export
+from pyTooling.Decorators import export
from pyGHDL.libghdl import libghdl
from pyGHDL.libghdl._types import Iir
diff --git a/pyGHDL/libghdl/vhdl/scanner.py b/pyGHDL/libghdl/vhdl/scanner.py
index f9db890a0..da6b63520 100644
--- a/pyGHDL/libghdl/vhdl/scanner.py
+++ b/pyGHDL/libghdl/vhdl/scanner.py
@@ -34,7 +34,7 @@
from ctypes import c_int, c_bool
-from pydecor import export
+from pyTooling.Decorators import export
from pyGHDL.libghdl import libghdl
from pyGHDL.libghdl._types import SourceFileEntry, NameId
diff --git a/pyGHDL/libghdl/vhdl/sem.py b/pyGHDL/libghdl/vhdl/sem.py
index b1a2fee5f..7556d6f53 100644
--- a/pyGHDL/libghdl/vhdl/sem.py
+++ b/pyGHDL/libghdl/vhdl/sem.py
@@ -32,7 +32,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# ============================================================================
-from pydecor import export
+from pyTooling.Decorators import export
from pyGHDL.libghdl._types import Iir_Design_Unit
from pyGHDL.libghdl._decorator import BindToLibGHDL
diff --git a/pyGHDL/libghdl/vhdl/sem_lib.py b/pyGHDL/libghdl/vhdl/sem_lib.py
index 0126c1ef5..41d95e2e5 100644
--- a/pyGHDL/libghdl/vhdl/sem_lib.py
+++ b/pyGHDL/libghdl/vhdl/sem_lib.py
@@ -32,7 +32,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# ============================================================================
-from pydecor import export
+from pyTooling.Decorators import export
from pyGHDL.libghdl._types import SourceFileEntry, Iir_Design_File, Iir_Design_Unit
from pyGHDL.libghdl._decorator import BindToLibGHDL
diff --git a/pyGHDL/libghdl/vhdl/tokens.py b/pyGHDL/libghdl/vhdl/tokens.py
index 9e347eff8..10c14fc40 100644
--- a/pyGHDL/libghdl/vhdl/tokens.py
+++ b/pyGHDL/libghdl/vhdl/tokens.py
@@ -2,7 +2,7 @@
# Call 'make' in 'src/vhdl' to regenerate:
#
from enum import IntEnum, unique
-from pydecor import export
+from pyTooling.Decorators import export
@export
diff --git a/pyGHDL/libghdl/vhdl/utils.py b/pyGHDL/libghdl/vhdl/utils.py
index c563ec9bd..3a82f45c0 100644
--- a/pyGHDL/libghdl/vhdl/utils.py
+++ b/pyGHDL/libghdl/vhdl/utils.py
@@ -32,7 +32,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# ============================================================================
-from pydecor import export
+from pyTooling.Decorators import export
from pyGHDL.libghdl._types import Iir, NameId
from pyGHDL.libghdl._decorator import BindToLibGHDL
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-23 18:13:42 +0000