diff --git a/src/rer/newsletter/content/channel.py b/src/rer/newsletter/content/channel.py index 7c25524d..43338d19 100644 --- a/src/rer/newsletter/content/channel.py +++ b/src/rer/newsletter/content/channel.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- from plone.app.contenttypes.content import Folder -from rer.newsletter.interfaces import IChannel -from zope.interface import implementer from rer.newsletter.adapter.subscriptions import IChannelSubscriptions +from rer.newsletter.interfaces import IChannel from zope.component import getMultiAdapter +from zope.interface import implementer @implementer(IChannel) diff --git a/src/rer/newsletter/content/message.py b/src/rer/newsletter/content/message.py index 76744438..d3d639f1 100644 --- a/src/rer/newsletter/content/message.py +++ b/src/rer/newsletter/content/message.py @@ -12,9 +12,9 @@ from zope.component import queryUtility from zope.interface import implementer - import re + try: from collective.taskqueue.interfaces import ITaskQueue from rer.newsletter.queue.handler import QUEUE_NAME diff --git a/src/rer/newsletter/restapi/services/message_send/get.py b/src/rer/newsletter/restapi/services/message_send/get.py index 4daa8503..eae8f6b1 100644 --- a/src/rer/newsletter/restapi/services/message_send/get.py +++ b/src/rer/newsletter/restapi/services/message_send/get.py @@ -4,6 +4,7 @@ import pyotp + NEWSLETTER_COUNTER_KEY = "newsletter-send-counter" diff --git a/src/rer/newsletter/restapi/services/message_send/post.py b/src/rer/newsletter/restapi/services/message_send/post.py index 25cd59fe..b6027f21 100644 --- a/src/rer/newsletter/restapi/services/message_send/post.py +++ b/src/rer/newsletter/restapi/services/message_send/post.py @@ -1,16 +1,14 @@ # -*- coding: utf-8 -*- from plone import api +from plone.protect.interfaces import IDisableCSRFProtection +from plone.restapi.deserializer import json_body from plone.restapi.services import Service from rer.newsletter import _ -from plone.restapi.deserializer import json_body +from rer.newsletter.restapi.services.message_send.get import NEWSLETTER_COUNTER_KEY from rer.newsletter.utils import OK -from plone.protect.interfaces import IDisableCSRFProtection -from zope.interface import alsoProvides -from rer.newsletter.restapi.services.message_send.get import ( - NEWSLETTER_COUNTER_KEY, -) -from zope.annotation.interfaces import IAnnotations from zExceptions import BadRequest +from zope.annotation.interfaces import IAnnotations +from zope.interface import alsoProvides import pyotp diff --git a/src/rer/newsletter/restapi/services/test_send/post.py b/src/rer/newsletter/restapi/services/test_send/post.py index 065c7215..e9848313 100644 --- a/src/rer/newsletter/restapi/services/test_send/post.py +++ b/src/rer/newsletter/restapi/services/test_send/post.py @@ -2,8 +2,8 @@ from plone import api from plone.restapi.deserializer import json_body from plone.restapi.services import Service -from zExceptions import BadRequest from rer.newsletter import _ +from zExceptions import BadRequest class TestSendPost(Service):