From a5b446d99ff872c4af199718e8a611591a838f73 Mon Sep 17 00:00:00 2001
From: Todd Dembrey <todd.dembrey@torchbox.com>
Date: Wed, 1 Aug 2018 12:31:53 +0100
Subject: [PATCH] fixup! Move the emailing into a celery task
---
opentech/apply/activity/apps.py | 2 +-
opentech/apply/activity/messaging.py | 2 +-
opentech/apply/activity/tasks.py | 1 -
opentech/apply/activity/tests/factories.py | 2 +-
4 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/opentech/apply/activity/apps.py b/opentech/apply/activity/apps.py
index 7e1f04ff8..c224ba349 100644
--- a/opentech/apply/activity/apps.py
+++ b/opentech/apply/activity/apps.py
@@ -5,4 +5,4 @@ class ActivityConfig(AppConfig):
name = 'opentech.apply.activity'
def ready(self):
- from . import signals
+ from . import signals # NOQA
diff --git a/opentech/apply/activity/messaging.py b/opentech/apply/activity/messaging.py
index 0597f0690..b7170407a 100644
--- a/opentech/apply/activity/messaging.py
+++ b/opentech/apply/activity/messaging.py
@@ -253,7 +253,7 @@ class EmailAdapter(AdapterBase):
def send_message(self, message, submission, subject, recipient, **kwargs):
try:
- emails_sent = send_mail(
+ send_mail(
subject,
message,
submission.page.specific.from_address,
diff --git a/opentech/apply/activity/tasks.py b/opentech/apply/activity/tasks.py
index eebac11d1..73ff71b83 100644
--- a/opentech/apply/activity/tasks.py
+++ b/opentech/apply/activity/tasks.py
@@ -1,7 +1,6 @@
from celery import Celery
from django.conf import settings
-from django.core.mail import send_mail as dj_send_mail
from django.core.mail import EmailMessage
app = Celery('tasks')
diff --git a/opentech/apply/activity/tests/factories.py b/opentech/apply/activity/tests/factories.py
index c1b6c22ef..30c09ab31 100644
--- a/opentech/apply/activity/tests/factories.py
+++ b/opentech/apply/activity/tests/factories.py
@@ -41,4 +41,4 @@ class MessageFactory(factory.DjangoModelFactory):
content = factory.Faker('sentence')
recipient = factory.Faker('email')
event = factory.SubFactory(EventFactory)
- external_id = factory.LazyFunction(lambda : '<{}>'.format(uuid.uuid4()))
+ external_id = factory.LazyFunction(lambda: '<{}>'.format(uuid.uuid4()))
--
GitLab