refactor dict usage (#321)

Author: ebroecker

src/canmatrix/cli/compare.py

@@ -84,7 +84,7 @@ def compare_db(db1, db2, ignore=None):
         if f1 is None:
             result.add_child(CompareResult("added", "FRAME", f2))
 
-    if "ATTRIBUTE" in ignore and ignore["ATTRIBUTE"] == "*":
+    if ignore.get("ATTRIBUTE", "") == "*":
         pass
     else:
         result.add_child(compare_attributes(db1, db2, ignore))
@@ -100,7 +100,7 @@ def compare_db(db1, db2, ignore=None):
         if ecu1 is None:
             result.add_child(CompareResult("added", "ecu", ecu2))
 
-    if "DEFINE" in ignore and ignore["DEFINE"] == "*":
+    if ignore.get("DEFINE", "") == "*":
         pass
     else:
         result.add_child(
@@ -120,7 +120,7 @@ def compare_db(db1, db2, ignore=None):
         temp.type = "Signal Defines"
         result.add_child(temp)
 
-    if "VALUETABLES" in ignore and ignore["VALUETABLES"]:
+    if ignore.get("VALUETABLES", False):
         pass
     else:
         for vt1 in db1.value_tables:
@@ -242,8 +242,7 @@ def compare_attributes(ele1, ele2, ignore=None):
     if ignore is None:
         ignore = dict()
     result = CompareResult("equal", "ATTRIBUTES", ele1)
-    if "ATTRIBUTE" in ignore and (
-            ignore["ATTRIBUTE"] == "*" or ignore["ATTRIBUTE"] == ele1):
+    if ignore.get("ATTRIBUTE", "") == "*" or ignore.get("ATTRIBUTE","") == ele1:
         return result
     for attribute in ele1.attributes:
         if attribute not in ele2.attributes:
@@ -281,7 +280,7 @@ def compare_ecu(ecu1, ecu2, ignore=None):
                     "changed", "ECU", ecu1, [
                         ecu1.comment, ecu2.comment]))
 
-    if "ATTRIBUTE" in ignore and ignore["ATTRIBUTE"] == "*":
+    if ignore.get("ATTRIBUTE", "") == "*":
         pass
     else:
         result.add_child(compare_attributes(ecu1, ecu2, ignore))
@@ -336,7 +335,7 @@ def compare_frame(f1, f2, ignore=None):
         if not s1:
             result.add_child(CompareResult("added", "SIGNAL", s2))
 
-    if "ATTRIBUTE" in ignore and ignore["ATTRIBUTE"] == "*":
+    if ignore.get("ATTRIBUTE", "") == "*":
         pass
     else:
         result.add_child(compare_attributes(f1, f2, ignore))
@@ -457,12 +456,12 @@ def compare_signal(s1, s2, ignore=None):
                     receiver,
                     s1.receivers))
 
-    if "ATTRIBUTE" in ignore and ignore["ATTRIBUTE"] == "*":
+    if ignore.get("ATTRIBUTE", "") == "*":
         pass
     else:
         result.add_child(compare_attributes(s1, s2, ignore))
 
-    if "VALUETABLES" in ignore and ignore["VALUETABLES"]:
+    if ignore.get("VALUETABLES", ""):
         pass
     else:
         result.add_child(compare_value_table(s1.values, s2.values))

src/canmatrix/formats/cmjson.py

@@ -48,9 +48,10 @@ def dump(db, f, **options):
     else:
         mode = 'wb'
 
-    additionalFrameColums = []  # type: typing.List[str]
-    if "additionalFrameAttributes" in options and options["additionalFrameAttributes"]:
-        additionalFrameColums = options["additionalFrameAttributes"].split(",")
+    if options.get("additionalFrameAttributes",False):
+        additionalFrameColums = options.get("additionalFrameAttributes").split(",")
+    else:
+        additionalFrameColums = []  # type: typing.List[str]
 
     exportArray = []  # type: typing.List[typing.Union[str, int, list, dict]]
 
@@ -192,10 +193,9 @@ def load(f, **options):
             newframe = canmatrix.Frame(frame["name"],
                                    arbitration_id=frame["id"],
                              size=8)
-            if "length" in frame:
-                newframe.size = frame["length"]
+            newframe.size = frame.get("length",0)
 
-            if "is_extended_frame" in frame and frame["is_extended_frame"]:
+            if frame.get("is_extended_frame", False):
                 newframe.arbitration_id.extended = 1
             else:
                 newframe.arbitration_id.extended = 0
@@ -221,7 +221,7 @@ def load(f, **options):
                                    factor=signal["factor"],
                                    offset=signal["offset"])
 
-                if signal.get("min") is not None:
+                if signal.get("min", False) is not None:
                     newsignal.min = newsignal.float_factory(signal["min"])
 
                 if signal.get("max", False):

src/canmatrix/formats/dbc.py

@@ -892,7 +892,7 @@ def add_frame_by_id(frame):  # type: (canmatrix.Frame) -> None
 # Backtracking
 
     for env_var_name, env_var in db.env_vars.items():
-        if "attributes" in env_var and 'SystemEnvVarLongSymbol' in env_var["attributes"]:
+        if 'SystemEnvVarLongSymbol' in env_var.get("attributes", ""):
             long_name = env_var["attributes"]["SystemEnvVarLongSymbol"][1:-1]
             del(env_var["attributes"]["SystemEnvVarLongSymbol"])
             db.env_vars[long_name] = db.env_vars.pop(env_var_name)
@@ -912,7 +912,7 @@ def add_frame_by_id(frame):  # type: (canmatrix.Frame) -> None
         #    frame.id -= 0x80000000
         #    frame.extended = 1
 
-        if "VFrameFormat" in frame.attributes and "_FD" in frame.attributes["VFrameFormat"]:
+        if "_FD" in frame.attributes.get("VFrameFormat",""):
             frame.is_fd = True
 
         for signal in frame.signals:

src/canmatrix/formats/xls.py

@@ -114,20 +114,17 @@ def dump(db, file, **options):
                 'Signal Name', 'Signal Function', 'Signal Length [Bit]', 'Signal Default', ' Signal Not Available', 'Byteorder']
     head_tail = ['Value',   'Name / Phys. Range', 'Function / Increment Unit']
 
-    if "additionalAttributes" in options  and len(options["additionalAttributes"]) > 0:
-        additional_signal_colums = options["additionalAttributes"].split(",")
+    if len(options.get("additionalAttributes", "")) > 0:
+        additional_signal_colums = options.get("additionalAttributes").split(",")
     else:
         additional_signal_colums = []#["attributes['DisplayDecimalPlaces']"]
 
-    if "additionalFrameAttributes" in options  and len(options["additionalFrameAttributes"]) > 0:
-        additional_frame_colums = options["additionalFrameAttributes"].split(",")
+    if len(options.get("additionalFrameAttributes","")) > 0:
+        additional_frame_colums = options.get("additionalFrameAttributes").split(",")
     else:
         additional_frame_colums = []#["attributes['DisplayDecimalPlaces']"]
 
-    if 'xlsMotorolaBitFormat' in options:
-        motorolaBitFormat = options["xlsMotorolaBitFormat"]
-    else:
-        motorolaBitFormat = "msbreverse"
+    motorolaBitFormat = options.get("xlsMotorolaBitFormat","msbreverse")
 
     workbook = xlwt.Workbook(encoding='utf8')
 #    wsname = os.path.basename(filename).replace('.xls', '')
@@ -469,7 +466,7 @@ def load(file, **options):
                 mux, signalComment = signalComment[4:].split(':', 1)
                 multiplex = int(mux.strip())
 
-            if "byteorder" in index:
+            if index.get("byteorder", False):
                 signalByteorder = sh.cell(rownum, index['byteorder']).value
 
                 if 'i' in signalByteorder:

src/canmatrix/formats/xlsx.py

@@ -123,13 +123,13 @@ def dump(db, filename, **options):
         'Byteorder']
     head_tail = ['Value', 'Name / Phys. Range', 'Function / Increment Unit']
 
-    if "additionalAttributes" in options and len(options["additionalAttributes"]) > 0:
-        additional_signal_colums = options["additionalAttributes"].split(",")
+    if len(options.get("additionalAttributes", "")) > 0:
+        additional_signal_colums = options.get("additionalAttributes").split(",")
     else:
         additional_signal_colums = []#["attributes['DisplayDecimalPlaces']"]
 
-    if "additionalFrameAttributes" in options and len(options["additionalFrameAttributes"]) > 0:
-        additional_frame_colums = options["additionalFrameAttributes"].split(",")
+    if len(options.get("additionalFrameAttributes", "")) > 0:
+        additional_frame_colums = options.get("additionalFrameAttributes").split(",")
     else:
         additional_frame_colums = []#["attributes['DisplayDecimalPlaces']"]
 
@@ -347,14 +347,8 @@ def readXlsx(file, **args):
     import zipfile
     from xml.etree.ElementTree import iterparse
 
-    if "sheet" in args:
-        sheet = args["sheet"]
-    else:
-        sheet = 1
-    if "header" in args:
-        isHeader = args["header"]
-    else:
-        isHeader = False
+    sheet = args.get("sheet", 1)
+    isHeader = args.get("header", False)
 
     rows = []  # type: typing.List[typing.Dict[str, str]]
     row = {}