Merge branch 'master' into bookings_limit

.github/workflows/isort.yaml

@@ -0,0 +1,14 @@
+name: Isort
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+        with:
+          python-version: 3.8
+      - uses: isort/isort-action@master
+        with:
+          configuration: --profile black

.isort.cfg

@@ -0,0 +1,2 @@
+[settings]
+profile=black

src/redturtle/prenotazioni/__init__.py

@@ -1,23 +1,20 @@
 # -*- coding: utf-8 -*-
+from datetime import datetime, timedelta
+from logging import FileHandler, Formatter, getLogger
+
+import dateutil
+import pytz
 from AccessControl import Unauthorized
 from App.config import getConfiguration
-from datetime import datetime
-from datetime import timedelta
 from DateTime import DateTime
 from dateutil.tz.tz import tzutc
-from logging import FileHandler
-from logging import Formatter
-from logging import getLogger
 from plone import api
 from plone.api.exc import UserNotFoundError
 from plone.app.event.base import default_timezone
-from redturtle.prenotazioni.utils import is_migration
 from six.moves import map
 from zope.i18nmessageid import MessageFactory
 
-import dateutil
-import pytz
-
+from redturtle.prenotazioni.utils import is_migration
 
 logger = getLogger("redturtle.prenotazioni")
 _ = MessageFactory("redturtle.prenotazioni")
@@ -121,7 +118,9 @@ def get_schema_data_impostor(*args, **kwargs):
     DeserializeFromJson.get_schema_data = get_schema_data_impostor
 
     try:
-        from redturtle.volto.restapi.deserializer.dxfields import DatetimeFieldDeserializer
+        from redturtle.volto.restapi.deserializer.dxfields import (
+            DatetimeFieldDeserializer,
+        )
     except ImportError:
         return
 

src/redturtle/prenotazioni/actions/mail.py

@@ -1,20 +1,20 @@
 # -*- coding: utf-8 -*-
-from Acquisition import aq_base
-from Acquisition import aq_inner
+import six
+from Acquisition import aq_base, aq_inner
 from collective.contentrules.mailfromfield import logger
 from collective.contentrules.mailfromfield.actions.mail import IMailFromFieldAction
-from collective.contentrules.mailfromfield.actions.mail import MailActionExecutor as BaseExecutor
+from collective.contentrules.mailfromfield.actions.mail import (
+    MailActionExecutor as BaseExecutor,
+)
 from plone.contentrules.rule.interfaces import IExecutable
 from plone.dexterity.interfaces import IDexterityContainer
 from plone.event.interfaces import IICalendar
 from Products.CMFPlone.interfaces.siteroot import IPloneSiteRoot
-from redturtle.prenotazioni.prenotazione_event import IMovedPrenotazione
 from six.moves import filter
 from zope.component import adapter
-from zope.interface import implementer
-from zope.interface import Interface
+from zope.interface import Interface, implementer
 
-import six
+from redturtle.prenotazioni.prenotazione_event import IMovedPrenotazione
 
 
 class MailActionExecutor(BaseExecutor):

src/redturtle/prenotazioni/adapters/booker.py

@@ -1,26 +1,24 @@
 # -*- coding: utf-8 -*-
+import math
 from datetime import timedelta
+from random import choice
+
 from DateTime import DateTime
 from plone import api
 from plone.memoize.instance import memoize
-from random import choice
-from redturtle.prenotazioni import _
-from redturtle.prenotazioni import datetime_with_tz
-from redturtle.prenotazioni import logger
+from six.moves.urllib.parse import parse_qs, urlparse
+from zope.annotation.interfaces import IAnnotations
+from zope.component import Interface
+from zope.event import notify
+from zope.interface import implementer
+
+from redturtle.prenotazioni import _, datetime_with_tz, logger
 from redturtle.prenotazioni.adapters.slot import BaseSlot
 from redturtle.prenotazioni.config import VERIFIED_BOOKING
 from redturtle.prenotazioni.content.prenotazione import VACATION_TYPE
 from redturtle.prenotazioni.exceptions import BookingsLimitExceded
 from redturtle.prenotazioni.prenotazione_event import MovedPrenotazione
 from redturtle.prenotazioni.utilities.dateutils import exceedes_date_limit
-from six.moves.urllib.parse import parse_qs
-from six.moves.urllib.parse import urlparse
-from zope.annotation.interfaces import IAnnotations
-from zope.component import Interface
-from zope.event import notify
-from zope.interface import implementer
-
-import math
 
 
 class BookerException(Exception):

src/redturtle/prenotazioni/adapters/conflict.py

@@ -1,13 +1,14 @@
 # -*- coding: utf-8 -*-
 from datetime import timedelta
+
+import six
 from plone.memoize.instance import memoize
 from Products.CMFCore.utils import getToolByName
-from redturtle.prenotazioni.adapters.slot import BaseSlot
 from six.moves import range
 from zope.component import Interface
 from zope.interface import implementer
 
-import six
+from redturtle.prenotazioni.adapters.slot import BaseSlot
 
 
 class IConflictManager(Interface):

src/redturtle/prenotazioni/adapters/ical.py

@@ -1,20 +1,15 @@
 # -*- coding: utf-8 -*-
+import icalendar
 from Acquisition import aq_inner
 from plone.app.event.base import default_timezone
-from plone.app.event.ical.exporter import ICalendarEventComponent
-from plone.app.event.ical.exporter import PRODID
-from plone.app.event.ical.exporter import VERSION
-from plone.event.interfaces import IICalendar
-from plone.event.interfaces import IICalendarEventComponent
+from plone.app.event.ical.exporter import PRODID, VERSION, ICalendarEventComponent
+from plone.event.interfaces import IICalendar, IICalendarEventComponent
 from plone.registry.interfaces import IRegistry
-from plone.stringinterp.interfaces import IContextWrapper
-from plone.stringinterp.interfaces import IStringSubstitution
-from redturtle.prenotazioni import _
-from zope.component import getAdapter
-from zope.component import getUtility
+from plone.stringinterp.interfaces import IContextWrapper, IStringSubstitution
+from zope.component import getAdapter, getUtility
 from zope.interface import implementer
 
-import icalendar
+from redturtle.prenotazioni import _
 
 
 def construct_icalendar(context, bookings):

src/redturtle/prenotazioni/adapters/prenotazione_email_message.py

@@ -4,18 +4,18 @@
 
 from email.mime.multipart import MIMEMultipart
 from email.mime.text import MIMEText
+
 from plone import api
 from plone.event.interfaces import IICalendar
-from plone.stringinterp.interfaces import IContextWrapper
-from plone.stringinterp.interfaces import IStringInterpolator
+from plone.stringinterp.interfaces import IContextWrapper, IStringInterpolator
 from Products.DCWorkflow.interfaces import IAfterTransitionEvent
+from zope.component import adapter, getAdapter
+from zope.interface import implementer
+
 from redturtle.prenotazioni import logger
 from redturtle.prenotazioni.content.prenotazione import IPrenotazione
 from redturtle.prenotazioni.interfaces import IPrenotazioneEmailMessage
 from redturtle.prenotazioni.prenotazione_event import IMovedPrenotazione
-from zope.component import adapter
-from zope.component import getAdapter
-from zope.interface import implementer
 
 
 class PrenotazioneEventEmailMessage:

src/redturtle/prenotazioni/adapters/slot.py

@@ -2,8 +2,7 @@
 from DateTime import DateTime
 from plone.app.event.base import default_timezone
 from pyinter.interval import Interval
-from six.moves import map
-from six.moves import range
+from six.moves import map, range
 from zope.component import Interface
 from zope.interface import implementer
 

src/redturtle/prenotazioni/adapters/stringinterp.py

@@ -1,11 +1,10 @@
 # -*- coding: utf-8 -*-
 from plone.app.event.base import default_timezone
 from plone.stringinterp.adapters import BaseSubstitution
-from redturtle.prenotazioni import _
-from redturtle.prenotazioni import logger
 from zope.component import adapter
 from zope.interface import Interface
 
+from redturtle.prenotazioni import _, logger
 
 try:
     from plone.app.event.base import spell_date

src/redturtle/prenotazioni/behaviors/booking_folder.py

@@ -2,11 +2,11 @@
 from plone.autoform.interfaces import IFormFieldProvider
 from plone.dexterity.interfaces import IDexterityContent
 from plone.supermodel import model
-from redturtle.prenotazioni import _
 from zope import schema
 from zope.component import adapter
-from zope.interface import implementer
-from zope.interface import provider
+from zope.interface import implementer, provider
+
+from redturtle.prenotazioni import _
 
 
 @provider(IFormFieldProvider)

src/redturtle/prenotazioni/browser/base.py

@@ -2,9 +2,10 @@
 from plone import api
 from plone.memoize.view import memoize
 from Products.Five.browser import BrowserView
+from zExceptions import NotFound
+
 from redturtle.prenotazioni.adapters.conflict import IConflictManager
 from redturtle.prenotazioni.content.prenotazioni_folder import IPrenotazioniFolder
-from zExceptions import NotFound
 
 
 class BaseView(BrowserView):

src/redturtle/prenotazioni/browser/delete_reservation.py

@@ -1,17 +1,17 @@
 # -*- coding: utf-8 -*-
+from datetime import datetime, time
+
 from AccessControl import Unauthorized
-from datetime import datetime
-from datetime import time
 from plone import api
 from plone.memoize.view import memoize
 from plone.protect import CheckAuthenticator
 from Products.CMFCore.utils import getToolByName
 from Products.Five.browser import BrowserView
-from redturtle.prenotazioni import _
-from zExceptions import Forbidden
-from zExceptions import NotFound
+from zExceptions import Forbidden, NotFound
 from zope.i18n import translate
 
+from redturtle.prenotazioni import _
+
 
 class BaseView(BrowserView):
     @property

src/redturtle/prenotazioni/browser/prenotazione.py

@@ -3,6 +3,7 @@
 from plone.memoize.view import memoize
 from plone.protect.authenticator import createToken
 from Products.Five.browser import BrowserView
+
 from redturtle.prenotazioni.config import MIN_IN_DAY
 from redturtle.prenotazioni.utilities.urls import urlify
 

src/redturtle/prenotazioni/browser/prenotazione_add.py

@@ -2,28 +2,24 @@
 from plone import api
 from plone.memoize.view import memoize
 from plone.z3cform.layout import wrap_form
-from redturtle.prenotazioni import _
-from redturtle.prenotazioni import datetime_with_tz
-from redturtle.prenotazioni.adapters.booker import BookerException
-from redturtle.prenotazioni.adapters.booker import IBooker
+from z3c.form import button, field, form
+from z3c.form.interfaces import (
+    HIDDEN_MODE,
+    ActionExecutionError,
+    WidgetActionExecutionError,
+)
+from zope.component import getUtility
+from zope.interface import Invalid, implementer
+from zope.schema import Text, TextLine
+from zope.schema.interfaces import IVocabularyFactory
+
+from redturtle.prenotazioni import _, datetime_with_tz
+from redturtle.prenotazioni.adapters.booker import BookerException, IBooker
 from redturtle.prenotazioni.browser.week import TIPOLOGIA_PRENOTAZIONE_NAME_COOKIE
 from redturtle.prenotazioni.browser.z3c_custom_widget import CustomRadioFieldWidget
 from redturtle.prenotazioni.config import REQUIRABLE_AND_VISIBLE_FIELDS
 from redturtle.prenotazioni.content.prenotazione import IPrenotazione
 from redturtle.prenotazioni.utilities.urls import urlify
-from z3c.form import button
-from z3c.form import field
-from z3c.form import form
-from z3c.form.interfaces import ActionExecutionError
-from z3c.form.interfaces import HIDDEN_MODE
-from z3c.form.interfaces import WidgetActionExecutionError
-from zope.component import getUtility
-from zope.interface import implementer
-from zope.interface import Invalid
-from zope.schema import Text
-from zope.schema import TextLine
-from zope.schema.interfaces import IVocabularyFactory
-
 
 DEFAULT_REQUIRED_FIELDS = []
 

src/redturtle/prenotazioni/browser/prenotazione_move.py

@@ -1,26 +1,18 @@
 # -*- coding: utf-8 -*-
+import logging
+
 from plone import api
 from plone.memoize.view import memoize
 from plone.protect.utils import addTokenToUrl
 from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
-from redturtle.prenotazioni import _
-from redturtle.prenotazioni import datetime_with_tz
-from redturtle.prenotazioni import tznow
-from redturtle.prenotazioni.adapters.booker import BookerException
-from redturtle.prenotazioni.adapters.booker import IBooker
-from redturtle.prenotazioni.utilities.urls import urlify
-from z3c.form import button
-from z3c.form import field
-from z3c.form import form
+from z3c.form import button, field, form
 from z3c.form.interfaces import ActionExecutionError
-from zope.interface import implementer
-from zope.interface import Interface
-from zope.interface import Invalid
-from zope.schema import Datetime
-from zope.schema import TextLine
-
-import logging
+from zope.interface import Interface, Invalid, implementer
+from zope.schema import Datetime, TextLine
 
+from redturtle.prenotazioni import _, datetime_with_tz, tznow
+from redturtle.prenotazioni.adapters.booker import BookerException, IBooker
+from redturtle.prenotazioni.utilities.urls import urlify
 
 logger = logging.getLogger(__name__)
 

src/redturtle/prenotazioni/browser/prenotazione_print.py

@@ -5,6 +5,7 @@
 from Products.CMFCore.utils import getToolByName
 from Products.Five.browser import BrowserView
 from Products.statusmessages.interfaces import IStatusMessage
+
 from redturtle.prenotazioni import _
 from redturtle.prenotazioni.utilities.urls import urlify