From 038938cc278fff3bff919501b6d902e4e6dfc97e Mon Sep 17 00:00:00 2001 From: Tyler Ward Date: Sun, 20 Sep 2020 01:57:33 +0100 Subject: [PATCH] Fix bugs from the the error handling additions. --- src/wireviz/DataClasses.py | 14 ++++++++------ src/wireviz/Harness.py | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/wireviz/DataClasses.py b/src/wireviz/DataClasses.py index b024e18..bb1c2e1 100644 --- a/src/wireviz/DataClasses.py +++ b/src/wireviz/DataClasses.py @@ -116,9 +116,10 @@ class Connector: if len(loop) != 2: raise Exception('Loops must be between exactly two pins!') - for additional_component in self.additional_components: - if 'type' not in additional_component: - raise Exception('Additional components must have a type specified') + if self.additional_components: + for additional_component in self.additional_components: + if 'type' not in additional_component: + raise Exception('Additional components must have a type specified') def activate_pin(self, pin): self.visible_pins[pin] = True @@ -204,9 +205,10 @@ class Cable: else: raise Exception('lists of part data are only supported for bundles') - for additional_component in self.additional_components: - if 'type' not in additional_component: - raise Exception('Additional components must have a type specified') + if self.additional_components: + for additional_component in self.additional_components: + if 'type' not in additional_component: + raise Exception('Additional components must have a type specified') def connect(self, from_name, from_pin, via_pin, to_name, to_pin): diff --git a/src/wireviz/Harness.py b/src/wireviz/Harness.py index 62dcdc0..bf907ea 100644 --- a/src/wireviz/Harness.py +++ b/src/wireviz/Harness.py @@ -111,7 +111,7 @@ class Harness: qty *= sum(1 for value in connector.visible_pins.values() if value is True) else: raise ValueError('invalid qty parameter {}'.format(extra["qty_multiplier"])) - rows.append(html_line_breaks(component_table_entry(extra.get["type"], qty, extra.get("unit", None), extra.get("pn", None), extra.get("manufacturer", None), extra.get("mpn", None)))) + rows.append(html_line_breaks(component_table_entry(extra["type"], qty, extra.get("unit", None), extra.get("pn", None), extra.get("manufacturer", None), extra.get("mpn", None)))) rows.append([html_line_breaks(connector.notes)]) html.extend(nested_html_table(rows))