summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThibault Delavallée <tde@openerp.com>2013-04-03 14:09:26 +0200
committerThibault Delavallée <tde@openerp.com>2013-04-03 14:09:26 +0200
commita173caa0f4e2d20f9bde2ce8126d9c49e82188d1 (patch)
tree8cc936366b1bbe83e18a75031775f83f84246df4
parent07bb17a6cb1d8bb151a974ac07c55eaf25eb9f11 (diff)
[FIX] Fixed wrong parameter name given to astimezone introduced at revision 8954; correct parameter name is tz, not tzinfo.
bzr revid: tde@openerp.com-20130403120926-xfxtj5hsva6jzb1u
-rw-r--r--addons/mail/mail_thread.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 44c158cba01..a6060f5f54f 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -809,7 +809,7 @@ class mail_thread(osv.AbstractModel):
# as RFC2822 requires timezone offset in Date headers.
stored_date = parsed_date.replace(tzinfo=pytz.utc)
else:
- stored_date = parsed_date.astimezone(tzinfo=pytz.utc)
+ stored_date = parsed_date.astimezone(tz=pytz.utc)
except Exception:
_logger.warning('Failed to parse Date header %r in incoming mail '
'with message-id %r, assuming current date/time.',