# HG changeset patch # User Sandro Knauß # Date 1332347416 -3600 # Node ID c5d8384caf68c2d5b86467b469a06dbd61b043a1 # Parent 08fcc2b6df992d70ff88846f036f0c8c34d17307 adding date Header to email diff -r 08fcc2b6df99 -r c5d8384caf68 iro/model/message.py --- a/iro/model/message.py Wed Mar 21 17:24:46 2012 +0100 +++ b/iro/model/message.py Wed Mar 21 17:30:16 2012 +0100 @@ -2,6 +2,7 @@ from email.mime.text import MIMEText from email.header import Header +from email.Utils import formatdate class Message: def __init__(self,content, typ="Message"): @@ -55,9 +56,10 @@ class Mail(Message): def __init__(self, subject, body, frm): - con=MIMEText(body.encode("utf-8"), _charset='utf-8') - sub=Header(subject.encode('utf-8'), 'utf-8') - con['Subject']=sub + con = MIMEText(body.encode("utf-8"), _charset='utf-8') + sub = Header(subject.encode('utf-8'), 'utf-8') + con['Subject'] = sub + con['Date'] = formatdate(localtime=True) self.subject = subject self.body = body self.frm=frm diff -r 08fcc2b6df99 -r c5d8384caf68 iro/tests/smtp.py --- a/iro/tests/smtp.py Wed Mar 21 17:24:46 2012 +0100 +++ b/iro/tests/smtp.py Wed Mar 21 17:30:16 2012 +0100 @@ -37,7 +37,9 @@ ret.load(_c.items()) return ret - def testSendMail(self): + @patch("iro.model.message.formatdate") + def testSendMail(self,mock_f): + mock_f.return_value="Wed, 21 Mar 2012 17:16:11 +0100" p=self.getSMTP() content = "sadfadfgwertsdgsdf\n\nsdfgaerasdfsad\nadfasdf" p.send("t@t.de", Mail("sub", content, None)) @@ -51,6 +53,7 @@ self.assertEqual(msg.get_all("From"),["send@t.de"]) self.assertEqual(toaddrs,["t@t.de"]) self.assertEqual(msg.get_all("To"),["t@t.de"]) + self.assertEqual(msg.get_all("Date"),["Wed, 21 Mar 2012 17:16:11 +0100"]) self.assertEqual(decode_header(msg.get("Subject")),[("sub","utf-8")]) self.assertEqual(base64.b64decode(msg.get_payload()),content)