diff options
| author | Olivier Dony <odo@openerp.com> | 2012-08-07 20:04:12 +0200 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2012-08-07 20:04:12 +0200 |
| commit | 86836d67dda1164be293645128595f8e0a9eb0a5 (patch) | |
| tree | 641f745a6c02d1333249d22340afc2e607ef9f4f /addons/fetchmail/fetchmail.py | |
| parent | 60722930cde52b50c7553641a054583fec378888 (diff) | |
[IMP] mail.alias: work-in-progress: cleanup actual email processing
bzr revid: odo@openerp.com-20120807180412-u2gdsjg579ak7zxp
Diffstat (limited to 'addons/fetchmail/fetchmail.py')
| -rw-r--r-- | addons/fetchmail/fetchmail.py | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py index f0e6a5179b4..8cd9e573862 100644 --- a/addons/fetchmail/fetchmail.py +++ b/addons/fetchmail/fetchmail.py @@ -189,14 +189,11 @@ openerp_mailgate.py -u %(uid)d -p PASSWORD -o %(model)s -d %(dbname)s --host=HOS result, data = imap_server.search(None, '(UNSEEN)') for num in data[0].split(): result, data = imap_server.fetch(num, '(RFC822)') - if server.object_id: - res_id = mail_thread.message_process(cr, uid, server.object_id.model, - data[0][1], - save_original=server.original, - strip_attachments=(not server.attach), - context=context) - else: - res_id = mail_thread.message_catchall(cr, uid, data[0][1]) + res_id = mail_thread.message_process(cr, uid, server.object_id.model, + data[0][1], + save_original=server.original, + strip_attachments=(not server.attach), + context=context) if res_id and server.action_id: action_pool.run(cr, uid, [server.action_id.id], {'active_id': res_id, 'active_ids':[res_id]}) imap_server.store(num, '+FLAGS', '\\Seen') @@ -217,14 +214,11 @@ openerp_mailgate.py -u %(uid)d -p PASSWORD -o %(model)s -d %(dbname)s --host=HOS for num in range(1, numMsgs + 1): (header, msges, octets) = pop_server.retr(num) msg = '\n'.join(msges) - if server.object_id: - res_id = mail_thread.message_process(cr, uid, server.object_id.model, - msg, - save_original=server.original, - strip_attachments=(not server.attach), - context=context) - else: - res_id = mail_thread.message_catchall(cr, uid, data[0][1]) + res_id = mail_thread.message_process(cr, uid, server.object_id.model, + msg, + save_original=server.original, + strip_attachments=(not server.attach), + context=context) if res_id and server.action_id: action_pool.run(cr, uid, [server.action_id.id], {'active_id': res_id, 'active_ids':[res_id]}) pop_server.dele(num) |