Ticket #20: additional_headers.patch

turbomail_tests/basic_tests.py

@@ -90 +90 @@
         self.failIf(msg.has_key('Old-Return-Path'))
         self.failIf(msg.has_key('Return-Path'))
 
+    def test_add_custom_headers(self):
+        "Test that custom headers can be attached."
+        extra_headers = {'Precendence': 'bulk', 'X-User': 'Alice'}
+        message = turbomail.Message('sender@foo.example', 
+                                    'recipient@foo.example', 'foo bar')
+        message.plain = 'Hello World!'
+        message.headers = extra_headers
+        turbomail.enqueue(message)
+        msginfo = get_received_mail(self.sink)
+        msg = email.message_from_string(msginfo['mail']) 
+        for header_name in extra_headers.keys():
+            self.failUnless(msg.has_key(header_name))
+            self.assertEquals(extra_headers[header_name], msg[header_name])
+

turbomail/documentation/guide.wiki

@@ -109 +109 @@
  * `date` -- The Date header.
  * `disposition` -- Request disposition notification be sent to this address.
  * `encoding` -- Content encoding specific to this message.
- * `headers` -- A list of additional headers.
+ * `headers` -- A dictionary or a tuple with additional headers.
  * `organization` -- The descriptive Organization header.
  * `plain` -- Plain text content.  Can be automatically generated.
  * `priority` -- The X-Priority header, in the range of 1-5.

turbomail/turbomail/message.py

@@ -140 +140 @@
                 self.rich = None
                 self.attachments = []
                 self.embedded = []
-                self.headers = []
+                self.headers = {}
                 self.smtpfrom = None
                 
                 for i, j in kw.iteritems():
@@ -306 +306 @@
                                         message.add_header(*header)
                                 elif type(header) == type({}):
                                         message.add_header(**header)
-                
-                if type(self.headers) == type({}):
+                elif type(self.headers) == type({}):
                         for name, header in self.headers.iteritems():
                                 if type(header) in [type(()), type([])]:
                                         message.add_header(name, *header)