From 4a7d981a9f76fa77e3e0f416054fdc003ee25979 Mon Sep 17 00:00:00 2001
From: fspreck <f.spreckelsen@indiscale.com>
Date: Tue, 25 Jan 2022 08:44:23 +0100
Subject: [PATCH] STY: autpep8'd
---
src/caosdb/apiutils.py | 11 ++++++-----
unittests/test_apiutils.py | 9 ++++-----
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/caosdb/apiutils.py b/src/caosdb/apiutils.py
index e0464cc8..a8256976 100644
--- a/src/caosdb/apiutils.py
+++ b/src/caosdb/apiutils.py
@@ -1,12 +1,11 @@
# -*- coding: utf-8 -*-
#
-# ** header v3.0
# This file is a part of the CaosDB Project.
#
# Copyright (C) 2018 Research Group Biomedical Physics,
# Max-Planck-Institute for Dynamics and Self-Organization Göttingen
# Copyright (C) 2020 Timm Fitschen <t.fitschen@indiscale.com>
-# Copyright (C) 2020 IndiScale GmbH <info@indiscale.com>
+# Copyright (C) 2020-2022 IndiScale GmbH <info@indiscale.com>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
@@ -109,7 +108,7 @@ def retrieve_entities_with_ids(entities):
for i in range(len(entities)//step+1):
collection.extend(
execute_query(
- create_id_query(entities[i*step:(i+1)*step])))
+ create_id_query(entities[i*step:(i+1)*step])))
return collection
@@ -561,6 +560,7 @@ def getCommitIn(folder):
COMPARED = ["name", "role", "datatype", "description", "importance",
"id", "path", "checksum", "size"]
+
def compare_entities(old_entity: Entity, new_entity: Entity):
"""
Compare two entites.
@@ -613,7 +613,7 @@ def compare_entities(old_entity: Entity, new_entity: Entity):
if new_entity_attr_exists:
newdiff[attr] = newattr
-
+
# properties
for prop in old_entity.properties:
@@ -653,7 +653,8 @@ def compare_entities(old_entity: Entity, new_entity: Entity):
olddiff["properties"].pop(prop.name)
else:
- raise NotImplementedError("Comparison not implemented for multi-properties.")
+ raise NotImplementedError(
+ "Comparison not implemented for multi-properties.")
for prop in new_entity.properties:
if len([0 for p in old_entity.properties if p.name == prop.name]) == 0:
diff --git a/unittests/test_apiutils.py b/unittests/test_apiutils.py
index 99394348..0294646f 100644
--- a/unittests/test_apiutils.py
+++ b/unittests/test_apiutils.py
@@ -1,12 +1,11 @@
# -*- encoding: utf-8 -*-
#
-# ** header v3.0
# This file is a part of the CaosDB Project.
#
# Copyright (C) 2018 Research Group Biomedical Physics,
# Max-Planck-Institute for Dynamics and Self-Organization Göttingen
# Copyright (C) 2020 Timm Fitschen <t.fitschen@indiscale.com>
-# Copyright (C) 2020 IndiScale GmbH <info@indiscale.com>
+# Copyright (C) 2020-2022 IndiScale GmbH <info@indiscale.com>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
@@ -180,10 +179,11 @@ def test_compare_entities_units():
assert diff_r1["properties"]["test"]["unit"] == "cm"
assert diff_r2["properties"]["test"]["unit"] == "m"
-
+
def test_compare_special_properties():
# Test for all known special properties:
- SPECIAL_PROPERTIES = ("description", "name", "checksum", "size", "path", "id")
+ SPECIAL_PROPERTIES = ("description", "name",
+ "checksum", "size", "path", "id")
INTS = ("size", "id")
HIDDEN = ("checksum", "size")
@@ -230,4 +230,3 @@ def test_compare_special_properties():
assert diff_r2[key] == 2
assert len(diff_r1["properties"]) == 0
assert len(diff_r2["properties"]) == 0
-
--
GitLab