Probable fix for #29.

marrow · Nov 23, 2011 · bde984b · bde984b
1 parent 6e240e6
commit bde984b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/marrow/mailer/message.py b/marrow/mailer/message.py
@@ -109,6 +109,9 @@ def id(self):
     def envelope(self):
         """Returns the address of the envelope sender address (SMTP from, if
         not set the sender, if this one isn't set too, the author)."""
+        if not self.sender and not self.author:
+            raise ValueError("Unable to determine message sender; no author or sender defined.")
+
         return self.sender or self.author[0]
 
     @property

diff --git a/marrow/mailer/transport/smtp.py b/marrow/mailer/transport/smtp.py
@@ -109,10 +109,12 @@ def deliver(self, message):
                 raise TransportExhaustedException()
 
     def send_with_smtp(self, message):
+        sender = bytes(message.envelope)
+        recipients = message.recipients.string_addresses
+        content = bytes(message)
+
         try:
-            sender = bytes(message.envelope)
-            recipients = message.recipients.string_addresses
-            self.connection.sendmail(sender, recipients, bytes(message))
+            self.connection.sendmail(sender, recipients, content)
             self.sent += 1
 
         except SMTPSenderRefused as e: