From 5540964a722da23856e60106f8e037460db01c69 Mon Sep 17 00:00:00 2001
From: Bjarke Madsen <bjarke@nordu.net>
Date: Mon, 21 Aug 2023 14:38:10 +0200
Subject: [PATCH] Remove redundant error checks and add empty contents check
---
compendium_v2/email/__init__.py | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/compendium_v2/email/__init__.py b/compendium_v2/email/__init__.py
index 573a6f03..645f756b 100644
--- a/compendium_v2/email/__init__.py
+++ b/compendium_v2/email/__init__.py
@@ -29,14 +29,8 @@ def send_mail(
logger.warning('No mail configuration, cannot send email.')
return
- if not isinstance(contents, str):
- raise ValueError('Contents must be a string.')
-
- if not isinstance(subject, str):
- raise ValueError('Subject must be a string.')
-
- if not isinstance(recipients, (str, Sequence)):
- raise ValueError('Recipients must be a string or a sequence of strings.')
+ if not contents or not isinstance(contents, str):
+ raise ValueError('Contents must be a non-empty string.')
excluded_admins = set(email.lower() for email in current_app.config['MAIL_EXCLUDED_ADMINS'])
--
GitLab