Merge lp:~therp-nl/therp-addons/7.0-fetchmail_inbox-email_from into lp:~therp-nl/therp-addons/7.0

Proposed by Stefan Rijnhart (Opener)
Status: Merged
Merged at revision: 98
Proposed branch: lp:~therp-nl/therp-addons/7.0-fetchmail_inbox-email_from
Merge into: lp:~therp-nl/therp-addons/7.0
Diff against target: 12 lines (+1/-1)
1 file modified
fetchmail_inbox/model/mail_message.py (+1/-1)
To merge this branch: bzr merge lp:~therp-nl/therp-addons/7.0-fetchmail_inbox-email_from
Reviewer Review Type Date Requested Status
Holger Brunn (Therp) code review Approve
Review via email: mp+201746@code.launchpad.net

Description of the change

To be consistent with message dicts produced by the mail module

To post a comment you must log in.
Revision history for this message
Holger Brunn (Therp) (hbrunn) :
review: Approve (code review)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'fetchmail_inbox/model/mail_message.py'
2--- fetchmail_inbox/model/mail_message.py 2014-01-14 11:57:05 +0000
3+++ fetchmail_inbox/model/mail_message.py 2014-01-15 10:24:55 +0000
4@@ -89,7 +89,7 @@
5 msg[field] = this[field].id
6 else:
7 msg[field] = this[field] or ''
8- msg['from'] = this.author_id.email or ''
9+ msg['from'] = this.author_id.email or this['email_from'] or ''
10 msg['to'] = ','.join([p.email for p in this.partner_ids])
11 msg['partner_ids'] = [(4, p.id) for p in this.partner_ids]
12 result[this.id] = msg

Subscribers

People subscribed via source and target branches

to all changes: