diff --git a/invenio_config_iform/custom_fields/__init__.py b/invenio_config_iform/custom_fields/__init__.py index 14f0139..8f5962d 100644 --- a/invenio_config_iform/custom_fields/__init__.py +++ b/invenio_config_iform/custom_fields/__init__.py @@ -8,7 +8,6 @@ """Custom fields.""" - from invenio_records_resources.services.custom_fields import BooleanCF ip_network = BooleanCF(name="ip_network") diff --git a/invenio_config_iform/permissions/generators.py b/invenio_config_iform/permissions/generators.py index 15df714..6d27fde 100644 --- a/invenio_config_iform/permissions/generators.py +++ b/invenio_config_iform/permissions/generators.py @@ -66,10 +66,7 @@ class RecordSingleIP(Generator): return [] # if record has singleip, and the ip of the user matches the allowed ip - if ( - record.get("custom_fields", {}).get("single_ip", False) - and self.check_permission() - ): + if record.get("custom_fields", {}).get("single_ip", False) and self.check_permission(): return [any_user] # non of the above - return empty @@ -94,10 +91,7 @@ class RecordSingleIP(Generator): Need provider is disallowed. """ try: - if ( - kwargs["record"]["custom_fields"]["single_ip"] - and not self.check_permission() - ): + if kwargs["record"]["custom_fields"]["single_ip"] and not self.check_permission(): return [any_user] except KeyError: @@ -138,10 +132,7 @@ class AllowedFromIPNetwork(Generator): return [] # if the record has set the ip_range allowance and is in the range - if ( - record.get("custom_fields", {}).get("ip_network", False) - and self.check_permission() - ): + if record.get("custom_fields", {}).get("ip_network", False) and self.check_permission(): return [any_user] # non of the above - return empty @@ -166,10 +157,7 @@ class AllowedFromIPNetwork(Generator): Need provider is disallowed. """ try: - if ( - kwargs["record"]["custom_fields"]["ip_network"] - and not self.check_permission() - ): + if kwargs["record"]["custom_fields"]["ip_network"] and not self.check_permission(): return [any_user] except KeyError: diff --git a/invenio_config_iform/permissions/policies.py b/invenio_config_iform/permissions/policies.py index dbd6498..f2c98ee 100644 --- a/invenio_config_iform/permissions/policies.py +++ b/invenio_config_iform/permissions/policies.py @@ -25,7 +25,6 @@ One can define any action as long as it follows that pattern and is verified at the moment it is undertaken. """ - from invenio_administration.generators import Administration from invenio_communities.generators import CommunityCurators from invenio_rdm_records.services.generators import ( diff --git a/tests/conftest.py b/tests/conftest.py index 39ce8a6..e111779 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -13,9 +13,8 @@ See https://pytest-invenio.readthedocs.io/ for documentation on which test fixtures are available. """ - -import pytest from flask import Flask +import pytest from invenio_config_iform import InvenioConfigIform