Skip to content

Commit

Permalink
Formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
folix-01 committed Apr 11, 2024
1 parent 99388a5 commit 475f952
Show file tree
Hide file tree
Showing 24 changed files with 181 additions and 155 deletions.
3 changes: 1 addition & 2 deletions src/collective/volto/formsupport/__init__.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
# -*- coding: utf-8 -*-
"""Init and utils."""
from zope.i18nmessageid import MessageFactory

import logging

from zope.i18nmessageid import MessageFactory

logger = logging.getLogger(__name__)
_ = MessageFactory("collective.volto.formsupport")
6 changes: 4 additions & 2 deletions src/collective/volto/formsupport/captcha/hcaptcha.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from . import CaptchaSupport
from collective.volto.formsupport import _
from plone.formwidget.hcaptcha.interfaces import IHCaptchaSettings
from plone.formwidget.hcaptcha.nohcaptcha import submit

Expand All @@ -9,6 +7,10 @@
from zope.component import queryUtility
from zope.i18n import translate

from collective.volto.formsupport import _

from . import CaptchaSupport


class HCaptchaSupport(CaptchaSupport):
name = _("HCaptcha")
Expand Down
6 changes: 4 additions & 2 deletions src/collective/volto/formsupport/captcha/honeypot.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
from . import CaptchaSupport
from collective.honeypot.config import HONEYPOT_FIELD
from collective.honeypot.utils import found_honeypot
from collective.volto.formsupport import _
from plone.restapi.deserializer import json_body
from zExceptions import BadRequest
from zope.i18n import translate

from collective.volto.formsupport import _

from . import CaptchaSupport


class HoneypotSupport(CaptchaSupport):
name = _("Honeypot Support")
Expand Down
8 changes: 5 additions & 3 deletions src/collective/volto/formsupport/captcha/norobots.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
from . import CaptchaSupport
from collective.volto.formsupport import _
import json

from collective.z3cform.norobots.browser.interfaces import INorobotsWidgetSettings
from plone import api
from plone.registry.interfaces import IRegistry
from zExceptions import BadRequest
from zope.component import queryUtility
from zope.i18n import translate

import json
from collective.volto.formsupport import _

from . import CaptchaSupport


class NoRobotsSupport(CaptchaSupport):
Expand Down
6 changes: 4 additions & 2 deletions src/collective/volto/formsupport/captcha/recaptcha.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
from . import CaptchaSupport
from collective.volto.formsupport import _
from plone.formwidget.recaptcha.interfaces import IReCaptchaSettings
from plone.formwidget.recaptcha.norecaptcha import submit
from plone.registry.interfaces import IRegistry
from zExceptions import BadRequest
from zope.component import queryUtility
from zope.i18n import translate

from collective.volto.formsupport import _

from . import CaptchaSupport


class RecaptchaSupport(CaptchaSupport):
name = _("Google ReCaptcha")
Expand Down
6 changes: 3 additions & 3 deletions src/collective/volto/formsupport/captcha/vocabularies.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
from ..interfaces import ICaptchaSupport
from zope.component import getAdapters
from zope.interface import provider
from zope.schema.interfaces import IVocabularyFactory
from zope.schema.vocabulary import SimpleTerm
from zope.schema.vocabulary import SimpleVocabulary
from zope.schema.vocabulary import SimpleTerm, SimpleVocabulary

from ..interfaces import ICaptchaSupport


@provider(IVocabularyFactory)
Expand Down
15 changes: 7 additions & 8 deletions src/collective/volto/formsupport/datamanager/catalog.py
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
# -*- coding: utf-8 -*-

from collective.volto.formsupport import logger
from collective.volto.formsupport.interfaces import IFormDataStore
from collective.volto.formsupport.utils import get_blocks
from copy import deepcopy
from datetime import datetime

from plone.dexterity.interfaces import IDexterityContent
from plone.restapi.deserializer import json_body
from repoze.catalog.catalog import Catalog
from repoze.catalog.indexes.field import CatalogFieldIndex
from souper.interfaces import ICatalogFactory
from souper.soup import get_soup
from souper.soup import NodeAttributeIndexer
from souper.soup import Record
from souper.soup import NodeAttributeIndexer, Record, get_soup
from zope.component import adapter
from zope.interface import implementer
from zope.interface import Interface
from zope.interface import Interface, implementer

from collective.volto.formsupport import logger
from collective.volto.formsupport.interfaces import IFormDataStore
from collective.volto.formsupport.utils import get_blocks


@implementer(ICatalogFactory)
Expand Down
2 changes: 1 addition & 1 deletion src/collective/volto/formsupport/locales/update.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# -*- coding: utf-8 -*-

import os
import pkg_resources
import subprocess

import pkg_resources

domain = "collective.volto.formsupport"
os.chdir(pkg_resources.resource_filename(domain, ""))
Expand Down
12 changes: 7 additions & 5 deletions src/collective/volto/formsupport/restapi/serializer/blocks.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
# -*- coding: utf-8 -*-
from collective.volto.formsupport.interfaces import ICaptchaSupport
from collective.volto.formsupport.interfaces import ICollectiveVoltoFormsupportLayer
import os

from plone import api
from plone.restapi.behaviors import IBlocks
from plone.restapi.interfaces import IBlockFieldSerializationTransformer
from Products.CMFPlone.interfaces import IPloneSiteRoot
from zope.component import adapter
from zope.component import getMultiAdapter
from zope.component import adapter, getMultiAdapter
from zope.interface import implementer

import os
from collective.volto.formsupport.interfaces import (
ICaptchaSupport,
ICollectiveVoltoFormsupportLayer,
)


class FormSerializer(object):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
# -*- coding: utf-8 -*-
from .form_data import FormData
from collective.volto.formsupport.interfaces import IFormDataStore
from plone.restapi.deserializer import json_body
from plone.restapi.services import Service
from zope.component import getMultiAdapter

from collective.volto.formsupport.interfaces import IFormDataStore

from .form_data import FormData


class FormDataClear(Service):
def reply(self):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# -*- coding: utf-8 -*-
from collective.volto.formsupport.interfaces import IFormDataStore
import csv

import six
from plone.restapi.serializer.converters import json_compatible
from plone.restapi.services import Service
from six import StringIO
from zope.component import getMultiAdapter

import csv
import six

from collective.volto.formsupport.interfaces import IFormDataStore

SKIP_ATTRS = ["block_id", "fields_labels", "fields_order"]

Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
# -*- coding: utf-8 -*-

from collective.volto.formsupport.interfaces import IFormDataStore
from collective.volto.formsupport.utils import get_blocks
from datetime import datetime
from datetime import timedelta
import json
from datetime import datetime, timedelta

import six
from plone import api
from plone.memoize import view
from plone.restapi.interfaces import IExpandableElement
from plone.restapi.serializer.converters import json_compatible
from plone.restapi.services import Service
from zope.component import adapter
from zope.component import getMultiAdapter
from zope.interface import implementer
from zope.interface import Interface
from zope.component import adapter, getMultiAdapter
from zope.interface import Interface, implementer

import json
import six
from collective.volto.formsupport.interfaces import IFormDataStore
from collective.volto.formsupport.utils import get_blocks


@implementer(IExpandableElement)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,37 +1,35 @@
# -*- coding: utf-8 -*-

from collective.volto.formsupport import _
from collective.volto.formsupport.interfaces import ICaptchaSupport
from collective.volto.formsupport.interfaces import IFormDataStore
from collective.volto.formsupport.interfaces import IPostEvent
from collective.volto.formsupport.utils import get_blocks
import codecs
import logging
import math
import os
from datetime import datetime
from email import policy
from email.message import EmailMessage
from xml.etree.ElementTree import Element, ElementTree, SubElement

import six
from plone import api
from plone.protect.interfaces import IDisableCSRFProtection
from plone.registry.interfaces import IRegistry
from plone.restapi.deserializer import json_body
from plone.restapi.services import Service
from plone.schema.email import _isemail
from Products.CMFPlone.interfaces.controlpanel import IMailSchema
from xml.etree.ElementTree import Element
from xml.etree.ElementTree import ElementTree
from xml.etree.ElementTree import SubElement
from zExceptions import BadRequest
from zope.component import getMultiAdapter
from zope.component import getUtility
from zope.component import getMultiAdapter, getUtility
from zope.event import notify
from zope.i18n import translate
from zope.interface import alsoProvides
from zope.interface import implementer

import codecs
import logging
import math
import os
import six
from zope.interface import alsoProvides, implementer

from collective.volto.formsupport import _
from collective.volto.formsupport.interfaces import (
ICaptchaSupport,
IFormDataStore,
IPostEvent,
)
from collective.volto.formsupport.utils import get_blocks

logger = logging.getLogger(__name__)
CTE = os.environ.get("MAIL_CONTENT_TRANSFER_ENCODING", None)
Expand Down
11 changes: 6 additions & 5 deletions src/collective/volto/formsupport/scripts/cleansing.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
# -*- coding: utf-8 -*-
from collective.volto.formsupport.interfaces import IFormDataStore
from collective.volto.formsupport.restapi.services.form_data.form_data import FormData
import sys

import click
import transaction
from plone import api
from zope.component import getMultiAdapter
from zope.globalrequest import getRequest

import click
import sys
import transaction
from collective.volto.formsupport.interfaces import IFormDataStore
from collective.volto.formsupport.restapi.services.form_data.form_data import FormData


@click.command(
Expand Down
18 changes: 10 additions & 8 deletions src/collective/volto/formsupport/testing.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
# -*- coding: utf-8 -*-
import collective.honeypot
import collective.MockMailHost
import plone.restapi
from plone.app.contenttypes.testing import PLONE_APP_CONTENTTYPES_FIXTURE
from plone.app.testing import applyProfile
from plone.app.testing import FunctionalTesting
from plone.app.testing import IntegrationTesting
from plone.app.testing import PloneSandboxLayer
from plone.app.testing import quickInstallProduct
from plone.app.testing import (
FunctionalTesting,
IntegrationTesting,
PloneSandboxLayer,
applyProfile,
quickInstallProduct,
)
from plone.restapi.testing import PloneRestApiDXLayer
from plone.testing import z2

import collective.honeypot
import collective.MockMailHost
import collective.volto.formsupport
import plone.restapi


class VoltoFormsupportLayer(PloneSandboxLayer):
Expand Down
28 changes: 15 additions & 13 deletions src/collective/volto/formsupport/tests/test_captcha.py
Original file line number Diff line number Diff line change
@@ -1,26 +1,28 @@
# -*- coding: utf-8 -*-
from collective.volto.formsupport.testing import ( # noqa: E501,
VOLTO_FORMSUPPORT_API_FUNCTIONAL_TESTING,
)
from collective.z3cform.norobots.browser.interfaces import INorobotsWidgetSettings
import json
import unittest
from hashlib import md5
from unittest.mock import Mock, patch

import transaction
from collective.z3cform.norobots.browser.interfaces import INorobotsWidgetSettings
from plone import api
from plone.app.testing import setRoles
from plone.app.testing import SITE_OWNER_NAME
from plone.app.testing import SITE_OWNER_PASSWORD
from plone.app.testing import TEST_USER_ID
from plone.app.testing import (
SITE_OWNER_NAME,
SITE_OWNER_PASSWORD,
TEST_USER_ID,
setRoles,
)
from plone.formwidget.hcaptcha.interfaces import IHCaptchaSettings
from plone.formwidget.recaptcha.interfaces import IReCaptchaSettings
from plone.registry.interfaces import IRegistry
from plone.restapi.testing import RelativeSession
from Products.MailHost.interfaces import IMailHost
from unittest.mock import Mock
from unittest.mock import patch
from zope.component import getUtility

import json
import transaction
import unittest
from collective.volto.formsupport.testing import ( # noqa: E501,
VOLTO_FORMSUPPORT_API_FUNCTIONAL_TESTING,
)


class TestCaptcha(unittest.TestCase):
Expand Down
21 changes: 12 additions & 9 deletions src/collective/volto/formsupport/tests/test_event.py
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
# -*- coding: utf-8 -*-
from collective.volto.formsupport.testing import ( # noqa: E501,
VOLTO_FORMSUPPORT_API_FUNCTIONAL_TESTING,
)
import unittest

import transaction
from plone import api
from plone.app.testing import setRoles
from plone.app.testing import SITE_OWNER_NAME
from plone.app.testing import SITE_OWNER_PASSWORD
from plone.app.testing import TEST_USER_ID
from plone.app.testing import (
SITE_OWNER_NAME,
SITE_OWNER_PASSWORD,
TEST_USER_ID,
setRoles,
)
from plone.registry.interfaces import IRegistry
from plone.restapi.testing import RelativeSession
from Products.MailHost.interfaces import IMailHost
from zope.component import getUtility
from zope.configuration import xmlconfig

import transaction
import unittest
from collective.volto.formsupport.testing import ( # noqa: E501,
VOLTO_FORMSUPPORT_API_FUNCTIONAL_TESTING,
)


def event_handler(event):
Expand Down

0 comments on commit 475f952

Please sign in to comment.