From 2dde5881f0b259e7232334b077ad5b3d71255670 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Andrei?= Date: Mon, 15 Jul 2024 10:44:24 -0300 Subject: [PATCH] Fix linting errors --- backend/scripts/create_site.py | 11 ++--------- .../volto/formsupport/captcha/norobots.py | 4 ++-- .../volto/formsupport/datamanager/catalog.py | 10 +++++----- .../formsupport/restapi/services/form_data/csv.py | 2 +- .../restapi/services/form_data/form_data.py | 4 ++-- .../restapi/services/submit_form/post.py | 13 ++++++++----- .../volto/formsupport/scripts/cleansing.py | 8 ++++---- .../src/collective/volto/formsupport/upgrades.py | 5 +---- 8 files changed, 25 insertions(+), 32 deletions(-) diff --git a/backend/scripts/create_site.py b/backend/scripts/create_site.py index 93fe2ad..fd32e9e 100644 --- a/backend/scripts/create_site.py +++ b/backend/scripts/create_site.py @@ -2,7 +2,6 @@ from collective.volto.formsupport.interfaces import ICollectiveVoltoFormsupportLayer from Products.CMFPlone.factory import _DEFAULT_PROFILE from Products.CMFPlone.factory import addPloneSite -from Products.GenericSetup.tool import SetupTool from Testing.makerequest import makerequest from zope.interface import directlyProvidedBy from zope.interface import directlyProvides @@ -35,7 +34,7 @@ def asbool(s): request = app.REQUEST -ifaces = [ICollectiveVoltoFormsupportLayer] + list(directlyProvidedBy(request)) +ifaces = [ICollectiveVoltoFormsupportLayer] + list(directlyProvidedBy(request)) # noQA: RUF005 directlyProvides(request, *ifaces) @@ -50,7 +49,7 @@ def asbool(s): "extension_ids": [ "collective.volto.formsupport:default", ], - "setup_content": False, + "setup_content": bool(EXAMPLE_CONTENT), "default_language": "en", "portal_timezone": "UTC", } @@ -63,10 +62,4 @@ def asbool(s): if site_id not in app.objectIds(): site = addPloneSite(app, site_id, **payload) transaction.commit() - if EXAMPLE_CONTENT: - portal_setup: SetupTool = site.portal_setup - portal_setup.runAllImportStepsFromProfile( - "collective.volto.formsupport:initial" - ) - transaction.commit() app._p_jar.sync() diff --git a/backend/src/collective/volto/formsupport/captcha/norobots.py b/backend/src/collective/volto/formsupport/captcha/norobots.py index 0800f12..a2d8ef1 100644 --- a/backend/src/collective/volto/formsupport/captcha/norobots.py +++ b/backend/src/collective/volto/formsupport/captcha/norobots.py @@ -56,10 +56,10 @@ def verify(self, data): context=self.context, request=self.request, name="norobots" ) value = json_token.get("value") - id = json_token.get("id") + id_ = json_token.get("id") id_check = json_token.get("id_check") - if not view.verify(input=value, question_id=id, id_check=id_check): + if not view.verify(input=value, question_id=id_, id_check=id_check): raise BadRequest( translate( _("The code you entered was wrong, please enter the new one."), diff --git a/backend/src/collective/volto/formsupport/datamanager/catalog.py b/backend/src/collective/volto/formsupport/datamanager/catalog.py index cdd0784..808a7e3 100644 --- a/backend/src/collective/volto/formsupport/datamanager/catalog.py +++ b/backend/src/collective/volto/formsupport/datamanager/catalog.py @@ -50,8 +50,8 @@ def get_form_fields(self): if not blocks: return {} form_block = {} - for id, block in blocks.items(): - if id != self.block_id: + for id_, block in blocks.items(): + if id_ != self.block_id: continue block_type = block.get("@type", "") if block_type == "form": @@ -98,7 +98,7 @@ def add(self, data): return self.soup.add(record) def length(self): - return len([x for x in self.soup.data.values()]) + return len([x for x in self.soup.data.values()]) # noQA: C416 def search(self, query=None): if not query: @@ -109,8 +109,8 @@ def search(self, query=None): ) return records - def delete(self, id): - record = self.soup.get(id) + def delete(self, id_): + record = self.soup.get(id_) del self.soup[record] def clear(self): diff --git a/backend/src/collective/volto/formsupport/restapi/services/form_data/csv.py b/backend/src/collective/volto/formsupport/restapi/services/form_data/csv.py index 16ddd87..2088b47 100644 --- a/backend/src/collective/volto/formsupport/restapi/services/form_data/csv.py +++ b/backend/src/collective/volto/formsupport/restapi/services/form_data/csv.py @@ -19,7 +19,7 @@ def __init__(self, context, request): blocks = getattr(context, "blocks", {}) if not blocks: return - for id, block in blocks.items(): + for _id, block in blocks.items(): block_type = block.get("@type", "") if block_type == "form": self.form_block = block diff --git a/backend/src/collective/volto/formsupport/restapi/services/form_data/form_data.py b/backend/src/collective/volto/formsupport/restapi/services/form_data/form_data.py index 43ed4f8..b8e997b 100644 --- a/backend/src/collective/volto/formsupport/restapi/services/form_data/form_data.py +++ b/backend/src/collective/volto/formsupport/restapi/services/form_data/form_data.py @@ -80,9 +80,9 @@ def form_block(self): blocks = json.loads(blocks) if not blocks: return {} - for id, block in blocks.items(): + for id_, block in blocks.items(): if block.get("@type", "") == "form" and block.get("store", False): - if not self.block_id or self.block_id == id: + if not self.block_id or self.block_id == id_: return block return {} diff --git a/backend/src/collective/volto/formsupport/restapi/services/submit_form/post.py b/backend/src/collective/volto/formsupport/restapi/services/submit_form/post.py index 8d5cdd7..1a49c08 100644 --- a/backend/src/collective/volto/formsupport/restapi/services/submit_form/post.py +++ b/backend/src/collective/volto/formsupport/restapi/services/submit_form/post.py @@ -88,7 +88,10 @@ def reply(self): context=self.request, ) self.request.response.setStatus(500) - return dict(type="InternalServerError", message=message) + return { + "type": "InternalServerError", + "message": message + } if store_action: self.store_data() @@ -258,8 +261,8 @@ def get_block_data(self, block_id): blocks = get_blocks(self.context) if not blocks: return {} - for id, block in blocks.items(): - if id != block_id: + for id_, block in blocks.items(): + if id_ != block_id: continue block_type = block.get("@type", "") if block_type != "form": @@ -338,7 +341,7 @@ def get_subject(self): return subject - def send_data(self): + def send_data(self): # noQA: C901 subject = self.get_subject() mfrom = self.form_data.get("from", "") or self.block.get("default_from", "") @@ -484,7 +487,7 @@ def manage_attachments(self, msg): if not attachments: return [] - for key, value in attachments.items(): + for _key, value in attachments.items(): content_type = "application/octet-stream" filename = None if isinstance(value, dict): diff --git a/backend/src/collective/volto/formsupport/scripts/cleansing.py b/backend/src/collective/volto/formsupport/scripts/cleansing.py index bd51489..43648e0 100644 --- a/backend/src/collective/volto/formsupport/scripts/cleansing.py +++ b/backend/src/collective/volto/formsupport/scripts/cleansing.py @@ -11,10 +11,10 @@ @click.command( help="bin/instance -OPlone run bin/formsupport_data_cleansing [--dryrun|--no-dryrun]", # noqa: E501 - context_settings=dict( - ignore_unknown_options=True, - allow_extra_args=True, - ), + context_settings={ + "ignore_unknown_options": True, + "allow_extra_args": True, + }, ) @click.option( "--dryrun/--no-dryrun", diff --git a/backend/src/collective/volto/formsupport/upgrades.py b/backend/src/collective/volto/formsupport/upgrades.py index d40842a..d341299 100644 --- a/backend/src/collective/volto/formsupport/upgrades.py +++ b/backend/src/collective/volto/formsupport/upgrades.py @@ -27,10 +27,7 @@ def _has_block_form(block_data): - for block in block_data.values(): - if block.get("@type", "") == "form": - return True - return False + return any(block.get("@type", "") == "form" for block in block_data.values()) def _get_all_content_with_blocks():