Definition-Names can now contain spaces

fix for #330

Author: ebroecker

src/canmatrix/formats/dbc.py

@@ -761,7 +761,7 @@ def add_frame_by_id(frame):  # type: (canmatrix.Frame) -> None
                 substring = decoded[7:].strip()
                 define_type = substring[:3]
                 substring = substring[3:].strip()
-                pattern = r"^\"([A-Za-z0-9\-_]+)\" +(.+);"
+                pattern = r"^\"([A-Za-z0-9\-_\ ]+)\" +(.+);"
                 regexp = re.compile(pattern)
                 regexp_raw = re.compile(pattern.encode(dbcImportEncoding))
                 temp = regexp.match(substring)

src/canmatrix/tests/test_copy.py

@@ -51,3 +51,26 @@ def test_copy_ecu_without_frames():
     assert len(matrix1.frames) == 1
     assert len(matrix1.ecus) == 1
     assert matrix1.ecu_by_name("ECU") is not None
+
+
+def test_copy_ecu_with_attributes():
+    matrix1 = canmatrix.canmatrix.CanMatrix()
+    frame1 = canmatrix.canmatrix.Frame("Frame1", arbitration_id=1)
+    frame1.add_signal(canmatrix.canmatrix.Signal("SomeSignal"))
+    matrix1.add_frame(frame1)
+
+    matrix2 = canmatrix.canmatrix.CanMatrix()
+    frame2 = canmatrix.canmatrix.Frame("Frame2", arbitration_id=2, transmitters= ["ECU"])
+    matrix2.add_frame(frame2)
+    matrix2.update_ecu_list()
+    matrix2.add_ecu_defines("Node Address", "INT 0 255")
+    matrix2.add_ecu_defines("attrib", "STRING")
+    matrix2.ecu_by_name("ECU").add_attribute("attrib", "attribValue")
+    matrix2.ecu_by_name("ECU").add_attribute("Node Address", 42)
+
+    canmatrix.copy.copy_ecu("ECU", matrix2, matrix1)
+
+    assert len(matrix1.frames) == 1
+    assert len(matrix1.ecus) == 1
+    assert matrix1.ecu_by_name("ECU") is not None
+    assert matrix1.ecu_by_name("ECU").attribute("Node Address") == 42

src/canmatrix/tests/test_dbc.py

@@ -227,3 +227,15 @@ def test_braces_in_attributes():
     BA_ "Signal Age [ms]" SG_ 20 sometext 5000;
      ''').encode('utf-8'))
     matrix = canmatrix.formats.dbc.load(dbc, dbcImportEncoding="utf8")
+
+def test_defines_with_spaces():
+    dbc = io.BytesIO(textwrap.dedent(u'''\
+    BU_: someOtherEcu
+
+    BA_DEF_ BU_ "Node Address" INT 0 255;
+    BA_ "Node Address" BU_ someOtherEcu 42;
+     ''').encode('utf-8'))
+    matrix = canmatrix.formats.dbc.load(dbc, dbcImportEncoding="utf8")
+    assert matrix.ecu_defines["Node Address"].type == "INT"
+    assert matrix.ecu_defines["Node Address"].min == 0
+    assert matrix.ecu_defines["Node Address"].max == 255