Improve null checking logic

Author: glopesdev

harp/schema.py

@@ -22,8 +22,16 @@ def read_schema(
         if not "WhoAmI" in schema.registers and include_common_registers:
             common = _read_common_registers()
             schema.registers = dict(common.registers, **schema.registers)
-            if schema.bitMasks is not None and common.bitMasks is not None:
-                schema.bitMasks = dict(common.bitMasks, **schema.bitMasks)
-            if schema.groupMasks is not None and common.groupMasks is not None:
-                schema.groupMasks = dict(common.groupMasks, **schema.groupMasks)
+            if common.bitMasks:
+                schema.bitMasks = (
+                    common.bitMasks
+                    if schema.bitMasks is None
+                    else dict(common.bitMasks, **schema.bitMasks)
+                )
+            if common.groupMasks:
+                schema.groupMasks = (
+                    common.groupMasks
+                    if schema.groupMasks is None
+                    else dict(common.groupMasks, **schema.groupMasks)
+                )
         return schema

tests/test_io.py

@@ -55,7 +55,7 @@ def __post_init__(self):
 
 @mark.parametrize("dataFile", testdata)
 def test_read(dataFile: DataFileParam):
-    context = pytest.raises if dataFile.expected_error is not None else nullcontext
+    context = pytest.raises if dataFile.expected_error else nullcontext
     with context(dataFile.expected_error):  # type: ignore
         data = read(
             dataFile.path,
@@ -68,7 +68,7 @@ def test_read(dataFile: DataFileParam):
         if dataFile.keep_type:
             assert "type" in data.columns and data["type"].dtype == "category"
 
-        if dataFile.expected_cols is not None:
+        if dataFile.expected_cols:
             for col in dataFile.expected_cols:
                 assert col in data.columns