Fixed for python 3.7

Author: Anton Schulte

tests/common.py

@@ -72,7 +72,7 @@ def set_env(**environ):
     >>> "PLUGINS_DIR" in os.environ
     False
 
-    :type environ: dict[str, unicode]
+    :type environ: Dict[str, unicode]
     :param environ: Environment variables to set
     """
     old_environ = dict(os.environ)

vunit/com/codec_vhdl_package.py

@@ -148,7 +148,7 @@ def _create_enumeration_of_all_msg_types(self):
 
         msg_type_enumeration_types = []
         for record in self.record_types:
-            if record.elements[0].identifier_list[0] == "msg_type":
+            if record.elements[0].identifier_List[0] == "msg_type":
                 msg_type_enumeration_types.append(record.elements[0].subtype_indication.code)
 
         msg_type_enumeration_literals = []
@@ -276,7 +276,7 @@ def _get_records_with_an_initial_msg_type_element(self):
 
         msg_type_record_types = []
         for record in self.record_types:
-            if record.elements[0].identifier_list[0] == "msg_type":
+            if record.elements[0].identifier_List[0] == "msg_type":
                 msg_type_record_types.append(record)
 
         return msg_type_record_types

vunit/configuration.py

@@ -12,7 +12,7 @@
 import inspect
 from pathlib import Path
 from copy import copy
-from typing import Any, Callable, OrderedDict, Union
+from typing import Any, Callable, List, OrderedDict, Union
 from vunit.sim_if.factory import SIMULATOR_FACTORY
 
 
@@ -129,7 +129,7 @@ def set_generic(self, name: str, value: Any) -> None:
         else:
             self.generics[name] = value
 
-    def set_sim_option(self, name: str, value: Union[str, list[str], bool]):
+    def set_sim_option(self, name: str, value: Union[str, List[str], bool]):
         """
         Set sim option
         """
@@ -196,7 +196,7 @@ class ConfigurationVisitor(object):
     def _check_enabled(self):
         pass
 
-    def get_configuration_dicts(self) -> list[OrderedDict[Any, Configuration]]:
+    def get_configuration_dicts(self) -> List[OrderedDict[Any, Configuration]]:
         raise NotImplementedError
 
     def set_attribute(self, name: str, value: Any):
@@ -226,7 +226,7 @@ def set_vhdl_configuration_name(self, value: str):
             for config in configs.values():
                 config.set_vhdl_configuration_name(value)
 
-    def set_sim_option(self, name: str, value: Union[str, list[str], bool], overwrite=True) -> None:
+    def set_sim_option(self, name: str, value: Union[str, List[str], bool], overwrite=True) -> None:
         """
         Set sim option
 

vunit/library.py

@@ -11,7 +11,7 @@
 """
 
 import logging
-from typing import cast, TYPE_CHECKING
+from typing import List, cast, TYPE_CHECKING
 from vunit.design_unit import Entity, VHDLDesignUnit
 from vunit.vhdl_standard import VHDLStandard
 
@@ -109,7 +109,7 @@ def _check_duplication(self, dictionary, design_unit):
         if design_unit.name in dictionary:
             self._warning_on_duplication(design_unit, dictionary[design_unit.name].source_file.name)
 
-    def add_vhdl_design_units(self, design_units: list[VHDLDesignUnit]):
+    def add_vhdl_design_units(self, design_units: List[VHDLDesignUnit]):
         """
         Add VHDL design units to the library
         """

vunit/project.py

@@ -9,10 +9,9 @@
 """
 Functionality to represent and operate on a HDL code project
 """
-from typing import Optional, Union
+from typing import List, Optional, Union, OrderedDict
 from pathlib import Path
 import logging
-from collections import OrderedDict
 from vunit.hashing import hash_string
 from vunit.dependency_graph import DependencyGraph, CircularDependencyException
 from vunit.vhdl_parser import VHDLParser
@@ -48,7 +47,7 @@ def __init__(self, depend_on_package_body=False, database=None):
         self._libraries: OrderedDict[str, Library] = OrderedDict()
         # Mapping between library lower case name and real library name
         self._lower_library_names_dict = {}
-        self._source_files_in_order: list[SourceFile] = []
+        self._source_files_in_order: List[SourceFile] = []
         self._manual_dependencies = []
         self._depend_on_package_body = depend_on_package_body
         self._builtin_libraries = set(["ieee", "std"])
@@ -517,7 +516,7 @@ def _get_files_to_recompile(self, files, dependency_graph, incremental):
 
     def get_dependencies_in_compile_order(
         self, target_files=None, implementation_dependencies=False
-    ) -> list[SourceFile]:
+    ) -> List[SourceFile]:
         """
         Get a list of dependencies of target files including the
         target files.
@@ -593,7 +592,7 @@ def comparison_key(source_file):
 
         return sorted(files, key=comparison_key)
 
-    def get_source_files_in_order(self) -> list[SourceFile]:
+    def get_source_files_in_order(self) -> List[SourceFile]:
         """
         Get a list of source files in the order they were added to the project
         """

vunit/sim_if/__init__.py

@@ -18,7 +18,7 @@
 from ..exceptions import CompileError
 from ..color_printer import NO_COLOR_PRINTER
 
-OptionType = Union[str, list[str], bool]
+OptionType = Union[str, List[str], bool]
 
 
 class Option(object):

vunit/sim_if/factory.py

@@ -9,7 +9,7 @@
 """
 
 import os
-from typing import Union
+from typing import Dict, List, Union
 from .activehdl import ActiveHDLInterface
 from .ghdl import GHDLInterface
 from .incisive import IncisiveInterface
@@ -38,7 +38,7 @@ def supported_simulators():
             NVCInterface,
         ]
 
-    def _extract_compile_options(self) -> dict[str, Option]:
+    def _extract_compile_options(self) -> Dict[str, Option]:
         """
         Return all supported compile options
         """
@@ -52,7 +52,7 @@ def _extract_compile_options(self) -> dict[str, Option]:
                 result[opt.name] = opt
         return result
 
-    def _extract_sim_options(self) -> dict[str, Option]:
+    def _extract_sim_options(self) -> Dict[str, Option]:
         """
         Return all supported sim options
         """
@@ -76,7 +76,7 @@ def _extract_sim_options(self) -> dict[str, Option]:
 
         return result
 
-    def check_sim_option(self, name: str, value: Union[str, list[str], bool]):
+    def check_sim_option(self, name: str, value: Union[str, List[str], bool]):
         """
         Check that sim_option has legal name and value
         """
@@ -95,7 +95,7 @@ def check_compile_option_name(self, name):
         if name not in known_options:
             raise ValueError(f"Unknown compile_option {name!r}, expected one of {known_options!r}")
 
-    def check_compile_option(self, name: str, value: Union[str, list[str], bool]) -> None:
+    def check_compile_option(self, name: str, value: Union[str, List[str], bool]) -> None:
         """
         Check that the compile option is valid
         """

vunit/source_file.py

@@ -8,7 +8,7 @@
 Functionality to represent and operate on VHDL and Verilog source files
 """
 from pathlib import Path
-from typing import Literal, Union
+from typing import Dict, Union
 import logging
 from copy import copy
 import traceback
@@ -36,7 +36,7 @@ def __init__(self, name, library, file_type):
         self.file_type = file_type
         self.design_units = []
         self._content_hash = None
-        self._compile_options: dict[str, OptionType] = {}
+        self._compile_options: Dict[str, OptionType] = {}
 
         # The file name before preprocessing
         self.original_name = name
@@ -351,7 +351,7 @@ def add_to_library(self, library):
 FILE_TYPES = ("vhdl",) + VERILOG_FILE_TYPES
 
 
-def file_type_of(file_name: Union[str, Path]) -> Literal["vhdl", "verilog", "systemverilog"]:
+def file_type_of(file_name: Union[str, Path]) -> str:
     """
     Return the file type of file_name based on the file ending
     """

vunit/test/bench.py

@@ -13,8 +13,7 @@
 import re
 import bisect
 import collections
-from collections import OrderedDict
-from typing import Any, Iterable, Union
+from typing import Any, Iterable, List, Union, OrderedDict
 from ..ostools import file_exists
 from ..cached import cached
 from ..vhdl_parser import remove_comments as remove_vhdl_comments
@@ -143,7 +142,7 @@ def get_test_case(self, name):
                 return test_case
         raise KeyError(name)
 
-    def get_configuration_dicts(self) -> list[OrderedDict[str, Configuration]]:  # pylint: disable=arguments-differ
+    def get_configuration_dicts(self) -> "List[OrderedDict[str, Configuration]]":  # pylint: disable=arguments-differ
         """
         Get all configurations within the test bench
 
@@ -359,7 +358,7 @@ def _check_enabled(self):
         if not self._enable_configuration:
             raise RuntimeError("Individual test configuration is not possible with run_all_in_same_sim")
 
-    def get_configuration_dicts(self) -> list[OrderedDict[Any, Configuration]]:  # pylint: disable=arguments-differ
+    def get_configuration_dicts(self) -> List[OrderedDict[Any, Configuration]]:  # pylint: disable=arguments-differ
         """
         Get all configurations of this test
         """

vunit/test/bench_list.py

@@ -10,7 +10,7 @@
 
 import re
 import logging
-from collections import OrderedDict
+from typing import List, OrderedDict
 
 from vunit.source_file import SourceFile
 from .list import TestList
@@ -49,10 +49,10 @@ def _add_test_bench(self, test_bench: TestBench) -> None:
     def get_test_bench(self, library_name, name) -> TestBench:
         return self._libraries[library_name][name]
 
-    def get_test_benches_in_library(self, library_name: str) -> list[TestBench]:
+    def get_test_benches_in_library(self, library_name: str) -> List[TestBench]:
         return list(self._libraries.get(library_name, {}).values())
 
-    def get_test_benches(self) -> list[TestBench]:
+    def get_test_benches(self) -> List[TestBench]:
         """
         Get all test benches
         """