summaryrefslogtreecommitdiff
path: root/addons/mail/mail_thread.py
diff options
context:
space:
mode:
authorAntonin Bourguignon <abo@openerp.com>2012-10-02 14:06:34 +0200
committerAntonin Bourguignon <abo@openerp.com>2012-10-02 14:06:34 +0200
commitc28dfb19e19ea9dde6de2ae5fb20cfec3860744e (patch)
tree4fdff0732f33426af59c7792b8e727458afe913c /addons/mail/mail_thread.py
parent79b2a0f6c6017d984b15160b8be806ecf7131b3e (diff)
parent2b2288a3bd29c096cc5eb70c4d966cfd32bffc45 (diff)
[MERGE] trunk-unmutable-defaults-abo: fix the last few methods that still have mutable defaults
also improve code style (methods signatures and whitespaces) contribution of Lionel Sausin from Numerigraphe bzr revid: abo@openerp.com-20121002120634-ms2ins653tktqfnt
Diffstat (limited to 'addons/mail/mail_thread.py')
-rw-r--r--addons/mail/mail_thread.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index c671dd55ec4..061647c388a 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -590,7 +590,7 @@ class mail_thread(osv.AbstractModel):
context = context or {}
attachments = attachments or []
assert (not thread_id) or isinstance(thread_id, (int,long)) or \
- (isinstance(thread_id, (list, tuple)) and len(thread_id) == 1), "Invalid thread_id"
+ (isinstance(thread_id, (list, tuple)) and len(thread_id) == 1), "Invalid thread_id"
if isinstance(thread_id, (list, tuple)):
thread_id = thread_id and thread_id[0]
@@ -618,7 +618,7 @@ class mail_thread(osv.AbstractModel):
'parent_id': parent_id,
'attachment_ids': attachment_ids,
})
- for x in ('from', 'to', 'cc'): values.pop(x, None) # Avoid warnings
+ for x in ('from', 'to', 'cc'): values.pop(x, None) # Avoid warnings
return self.pool.get('mail.message').create(cr, uid, values, context=context)
#------------------------------------------------------