From 6afd791bef87b1a7b5664bd8b2b979c310697d62 Mon Sep 17 00:00:00 2001 From: "Victor \"multun\" Collod" Date: Fri, 8 Mar 2019 18:53:21 +0100 Subject: [PATCH] Fail on missing from_address --- todo/mail/delivery.py | 4 ++++ todo/utils.py | 6 +----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/todo/mail/delivery.py b/todo/mail/delivery.py index 5b7f2d4..33f916f 100644 --- a/todo/mail/delivery.py +++ b/todo/mail/delivery.py @@ -10,6 +10,10 @@ def _declare_backend(backend_path): backend_module = importlib.import_module(backend_module_name) backend = getattr(backend_module, class_name) return backend(*args, **kwargs) + + if from_address is None: + raise ValueError("missing from_address") + _backend.from_address = from_address _backend.headers = headers return _backend diff --git a/todo/utils.py b/todo/utils.py index a2cde5b..c5b58a4 100644 --- a/todo/utils.py +++ b/todo/utils.py @@ -46,11 +46,7 @@ def todo_get_mailer(user, task): if task_backend is None: return (None, mail.get_connection) - from_address = getattr(task_backend, "from_address", None) - if from_address is None: - # worst fallback ever - from_address = user.email - + from_address = getattr(task_backend, "from_address") from_address = email.utils.formataddr((user.username, from_address)) return (from_address, task_backend)