From f66eba25b139f993a10ca758fb1f698d38ad1e0f Mon Sep 17 00:00:00 2001
From: Alexander Schlemmer <alexander@mail-schlemmer.de>
Date: Thu, 17 Mar 2022 13:10:32 +0100
Subject: [PATCH] STY: style fixes for this branch
---
src/caosdb/apiutils.py | 6 +++---
unittests/test_apiutils.py | 1 +
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/caosdb/apiutils.py b/src/caosdb/apiutils.py
index 9d8d751e..8714a683 100644
--- a/src/caosdb/apiutils.py
+++ b/src/caosdb/apiutils.py
@@ -727,14 +727,14 @@ def merge_entities(entity_a: Entity, entity_b: Entity):
for key in diff_r2["properties"]:
if key in diff_r1["properties"]:
if ("importance" in diff_r1["properties"][key] and
- "importance" in diff_r2["properties"][key]):
+ "importance" in diff_r2["properties"][key]):
if (diff_r1["properties"][key]["importance"] !=
- diff_r2["properties"][key]["importance"]):
+ diff_r2["properties"][key]["importance"]):
raise NotImplementedError()
elif ("importance" in diff_r1["properties"][key] or
"importance" in diff_r2["properties"][key]):
raise NotImplementedError()
-
+
for attribute in ("datatype", "unit", "value"):
if diff_r1["properties"][key][attribute] is None:
setattr(entity_a.get_property(key), attribute,
diff --git a/unittests/test_apiutils.py b/unittests/test_apiutils.py
index 6ce53a24..1dab18a3 100644
--- a/unittests/test_apiutils.py
+++ b/unittests/test_apiutils.py
@@ -231,6 +231,7 @@ def test_compare_special_properties():
assert len(diff_r1["properties"]) == 0
assert len(diff_r2["properties"]) == 0
+
def test_copy_entities():
r = db.Record(name="A")
r.add_parent(name="B")
--
GitLab