fixup: If no message data is available, make subject and to_addresses…

… return None
pinax · Apr 13, 2024 · 7991223 · 7991223
1 parent c3361ad
commit 7991223
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/mailer/models.py b/src/mailer/models.py
@@ -310,12 +310,12 @@ def to_addresses(self):
         if email is not None:
             return email.to
         else:
-            return []
+            return None
 
     @property
     def subject(self):
         email = self.email
         if email is not None:
             return email.subject
         else:
-            return ""
+            return None
diff --git a/tests/test_mailer.py b/tests/test_mailer.py
@@ -634,8 +634,8 @@ def test_message_log(self):
             # Fake a log entry without email
             log.message_data = ""
 
-            self.assertEqual(log.to_addresses, [])
-            self.assertEqual(log.subject, "")
+            self.assertEqual(log.to_addresses, None)
+            self.assertEqual(log.subject, None)
 
     def test_message_log_without_log_message_data(self):
         with self.settings(
@@ -659,8 +659,8 @@ def test_message_log_without_log_message_data(self):
 
             self.assertEqual(log.email, None)
             self.assertEqual(log.message_data, None)
-            self.assertEqual(log.to_addresses, [])
-            self.assertEqual(log.subject, "")
+            self.assertEqual(log.to_addresses, None)
+            self.assertEqual(log.subject, None)
             self.assertEqual(log.when_added, when_added)
 
     def test_message_str(self):