summaryrefslogtreecommitdiff
path: root/py-fake-service/app/adapter/mail.py
diff options
context:
space:
mode:
authorDuda Dornelles <ddornell@thoughtworks.com>2014-09-11 11:24:47 -0300
committerDuda Dornelles <ddornell@thoughtworks.com>2014-09-11 11:24:51 -0300
commite0cd19256171b18eee571808f7fc12cd042faf19 (patch)
treec1c638854463a72500b4f11a9a1fe9854aa17b9c /py-fake-service/app/adapter/mail.py
parent6b62849aa40023fd9eba666560984e0edfedc55d (diff)
Fixing functional tests (py fake has to work with both csv mailset or
old mailset)
Diffstat (limited to 'py-fake-service/app/adapter/mail.py')
-rw-r--r--py-fake-service/app/adapter/mail.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/py-fake-service/app/adapter/mail.py b/py-fake-service/app/adapter/mail.py
index a18f6276..5a298385 100644
--- a/py-fake-service/app/adapter/mail.py
+++ b/py-fake-service/app/adapter/mail.py
@@ -71,7 +71,7 @@ class Mail:
def _get_headers(self, mbox_mail):
headers = {}
- headers['from'] = mbox_mail.get('From')
+ headers['from'] = mbox_mail.get('From') or mbox_mail.from_addr
headers['to'] = [mbox_mail.get('To')]
headers['subject'] = mbox_mail.get('Subject')
headers['date'] = datetime.fromtimestamp(