diff --git a/PySpice/Spice/NgSpice/SimulationType.py b/PySpice/Spice/NgSpice/SimulationType.py index e5df5da74..6ddd7da66 100644 --- a/PySpice/Spice/NgSpice/SimulationType.py +++ b/PySpice/Spice/NgSpice/SimulationType.py @@ -81,3 +81,7 @@ ) SIMULATION_TYPE[28] = SIMULATION_TYPE[27] + +SIMULATION_TYPE[29] = SIMULATION_TYPE[27] + +SIMULATION_TYPE[30] = SIMULATION_TYPE[27] \ No newline at end of file diff --git a/PySpice/Spice/Parser.py b/PySpice/Spice/Parser.py index 3955713eb..6033971db 100644 --- a/PySpice/Spice/Parser.py +++ b/PySpice/Spice/Parser.py @@ -388,7 +388,7 @@ def to_python(self, ground=0): def build(self, ground=0): - subcircuit = SubCircuit(self._name, self._nodes) + subcircuit = SubCircuit(self._name, *self._nodes) SpiceParser._build_circuit(subcircuit, self._statements, ground) return subcircuit diff --git a/setup_data.py b/setup_data.py index 6012e0ad6..a31d497e9 100644 --- a/setup_data.py +++ b/setup_data.py @@ -32,7 +32,7 @@ else: pyspice_path = pyspice_path.parent init_path = pyspice_path.joinpath('PySpice', '__init__.py') -with open(init_path) as fh: +with init_path.open() as fh: try: version = re.findall(r"^__version__ = '([^']+)'\r?$", fh.read(), re.M)[0] except IndexError: