Add headers to autoresponses in human-friendly order.

git-svn-id: svn+ssh://open.inoi.fi/open-scalemail/trunk@128 b5f3cfec-f4e5-0310-a79a-9a52b1b86675

scalemail/gone/respond.py

@@ -40,6 +40,17 @@ def prepare(msg,
             recipientName=None,
             subjectPrefix=None):
     sender = goneutil.getSender(msg)
+
+    if ('From' not in reply
+        and recipient is not None):
+            if '@' in recipient:
+                local, host = recipient.split('@', 1)
+                box, domain = util.host_split(host)
+                if domain is not None:
+                    host = domain
+                recipient = str(smtp.Address(local, host))
+            reply['From'] = email.Utils.formataddr((recipientName, recipient))
+
     to = msg.get_all('Sender', None)
     if to is None:
         to = msg.get_all('From', None)
@@ -56,16 +67,6 @@ def prepare(msg,
             subject = subjectPrefix + subject
         reply['Subject'] = subject
 
-    if ('From' not in reply
-        and recipient is not None):
-            if '@' in recipient:
-                local, host = recipient.split('@', 1)
-                box, domain = util.host_split(host)
-                if domain is not None:
-                    host = domain
-                recipient = str(smtp.Address(local, host))
-            reply['From'] = email.Utils.formataddr((recipientName, recipient))
-
     msgid = msg.get('Message-ID', None)
     if msgid is not None:
         msgid = msgid.strip()

scalemail/gone/test/test_respond.py

@@ -227,3 +227,12 @@ def test_to_envelopeSender(self):
 """)
         r = respond.prepare(self.msg, reply, recipient='the-recipient')
         self.assertEquals(r.get_all('To'), ['the-sender'])
+
+    def test_order(self):
+        """Headers are added in human-friendly order, From/To/Subject."""
+        reply = email.message_from_string("""\
+
+body
+""")
+        r = respond.prepare(self.msg, reply, recipient='the-recipient')
+        self.assertEquals(r.keys(), ['From', 'To', 'Subject'])