Ticket #12: smtpfrom_fix.patch

turbomail/dispatch.py

@@ -147 +147 @@
                         packUpdate['addrfrom'] = '- %s' % pack['sender']
                         packUpdate['smtpfrom'] = pack['sender']
                 
-                if 'smtpfrom' in pack:
+                if 'smtpfrom' in pack and pack['smtpfrom'] != None:
                         if isinstance(pack['smtpfrom'], tuple):
                                 packUpdate['smtpfrom'] = pack['smtpfrom'][1]
                         else:

turbomail/message.py

@@ -360 +360 @@
                 
                 return dict(
                                 sender=self.sender,
+                                smtpfrom = self.smtpfrom,
                                 to=[[self.recipient], self.recipient][isinstance(self.recipient, list)],
                                 recipients=[i[1] for i in recipients if isinstance(i, tuple)] + [i for i in recipients if not isinstance(i, tuple)],
                                 subject=self.subject,