From dafb45aabfac1a9c4bc990f6f9ff75485c23ad32 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Sun, 20 Jul 2014 17:17:00 +0200 Subject: [PATCH] ValueError can be raised by the datetime module too... fix #556 --- modoboa/extensions/webmail/lib/imapheader.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modoboa/extensions/webmail/lib/imapheader.py b/modoboa/extensions/webmail/lib/imapheader.py index 2106ef8e3..ffc8cafb6 100644 --- a/modoboa/extensions/webmail/lib/imapheader.py +++ b/modoboa/extensions/webmail/lib/imapheader.py @@ -85,9 +85,9 @@ def parse_date(value, **kwargs): tmp = email.utils.parsedate_tz(value) if not tmp: return value - ndate = datetime.datetime(*(tmp)[:7]) - now = datetime.datetime.now() try: + ndate = datetime.datetime(*(tmp)[:7]) + now = datetime.datetime.now() if now - ndate > datetime.timedelta(7): return ndate.strftime("%d.%m.%Y %H:%M") return ndate.strftime("%a %H:%M")