bugfix for #625

Author: ebroecker

src/canmatrix/canmatrix.py

@@ -106,7 +106,12 @@ def add_attribute(self, attribute, value):  # type (attribute: str, value: typin
         :param str attribute: Attribute name
         :param any value: Attribute value
         """
-        self.attributes[attribute] = value
+        try:
+            self.attributes[attribute] = str(value)
+        except UnicodeDecodeError:
+            self.attributes[attribute] = value
+        if type(self.attributes[attribute]) == str:
+            self.attributes[attribute] = self.attributes[attribute].strip()
 
     def del_attribute(self, attribute):
         if attribute in self.attributes:
@@ -282,7 +287,12 @@ def add_attribute(self, attribute, value):
         :param str attribute: attribute name
         :param value: attribute value
         """
-        self.attributes[attribute] = value
+        try:
+            self.attributes[attribute] = str(value)
+        except UnicodeDecodeError:
+            self.attributes[attribute] = value
+        if type(self.attributes[attribute]) == str:
+            self.attributes[attribute] = self.attributes[attribute].strip()
 
     def del_attribute(self, attribute):
         """
@@ -1715,7 +1725,12 @@ def add_attribute(self, attribute, value):  # type: (str, typing.Any) -> None
         :param str attribute: attribute name
         :param value: attribute value
         """
-        self.attributes[attribute] = value
+        try:
+            self.attributes[attribute] = str(value)
+        except UnicodeDecodeError:
+            self.attributes[attribute] = value
+        if type(self.attributes[attribute]) == str:
+            self.attributes[attribute] = self.attributes[attribute].strip()
 
     def add_signal_defines(self, type, definition):
         """

src/canmatrix/formats/dbc.py

@@ -91,7 +91,7 @@ def create_attribute_string(attribute, attribute_class, name, value, is_string):
     # type: (str, str, str, typing.Any, bool) -> str
     if is_string:
         value = '"' + value + '"'
-    elif not value:
+    elif value is None:
         value = '""'
 
     attribute_string = 'BA_ "' + attribute + '" ' + attribute_class + ' ' + name + ' ' + str(value) + ';\n'

src/canmatrix/tests/test_dbc.py

@@ -523,11 +523,24 @@ def test_int_attribute_zero():
     frame = canmatrix.Frame("some Frame")
     frame.add_signal(canmatrix.Signal("signal_name", size=1, start_bit=1))
     db.add_frame(frame)
+    db.add_ecu_defines("ecu_define", "INT 0 10")
+    db.add_ecu_defines("ecu_define2", "INT 0 10")
+    db.add_ecu_defines("ecu_define3", "INT 0 10")
+
     db.add_frame_defines("test", "INT 0 10")
     db.add_frame_defines("test2", "INT 0 10")
     frame.add_attribute("test", 7)
     frame.add_attribute("test2", 0)
+
+    ecu = canmatrix.Ecu('TestEcu')
+    ecu.add_attribute('ecu_define', 1)
+    ecu.add_attribute('ecu_define2', 0)
+
+    db.add_ecu(ecu)
+
     outdbc = io.BytesIO()
     canmatrix.formats.dump(db, outdbc, "dbc")
     assert 'BO_ 0 7' in outdbc.getvalue().decode('utf8')
     assert 'BO_ 0 0' in outdbc.getvalue().decode('utf8')
+    assert 'TestEcu 1' in outdbc.getvalue().decode('utf8')
+    assert 'TestEcu 0' in outdbc.getvalue().decode('utf8')