diff --git a/src/linkahead/apiutils.py b/src/linkahead/apiutils.py index fd2c23d63be0cde90d5506be2d26a89933fc8e6a..9e4ba622116cac03a9b17f9c5271e7b06c973b36 100644 --- a/src/linkahead/apiutils.py +++ b/src/linkahead/apiutils.py @@ -379,14 +379,15 @@ def compare_entities(entity0: Optional[Entity] = None, # compare properties for prop in entity0.properties: - key = prop.name if prop.name else prop.id # ToDo: Would making id default break anything? + key = prop.name if prop.name is not None else prop.id # ToDo: Would making id default break anything? matching = entity1.properties.filter(prop) if len(matching) == 0: # entity1 has prop, entity0 does not diff[0]["properties"][key] = {} elif len(matching) == 1: # It's possible that prop has name and id, but match only has id - key = prop.name if prop.name and matching[0].name else prop.id + key = prop.name if (prop.name is not None and + matching[0].name is not None) else prop.id diff[0]["properties"][key] = {} diff[1]["properties"][key] = {} propdiff = (diff[0]["properties"][key], @@ -431,7 +432,7 @@ def compare_entities(entity0: Optional[Entity] = None, # we have not yet compared properties that do not exist in entity0 for prop in entity1.properties: - key = prop.name if prop.name else prop.id # ToDo: Would making id default break anything? + key = prop.name if prop.name is not None else prop.id # ToDo: Would making id default break anything? # check how often the property appears in entity0 num_prop_in_ent0 = len(entity0.properties.filter(prop)) if num_prop_in_ent0 == 0: @@ -447,7 +448,7 @@ def compare_entities(entity0: Optional[Entity] = None, for index, parents, other_entity in [(0, entity0.parents, entity1), (1, entity1.parents, entity0)]: for parent in parents: - key = parent.name if parent.name else parent.id # ToDo: Would making id default break anything? + key = parent.name if parent.name is not None else parent.id # ToDo: Would making id default break anything? matching = other_entity.parents.filter(parent) if len(matching) == 0: diff[index]["parents"].append(key)