dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed issue 1557:imap: unexpected date format is not handled, thanks Alan

Browse Source
This commit is contained in:
mdipierro
2013-06-23 08:51:42 -05:00
parent 37c2441507
commit b980d32d02
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.5.1-stable+timestamp.2013.06.23.08.49.34
Version 2.5.1-stable+timestamp.2013.06.23.08.50.58
gluon/dal.py
+12 -12
View File
@@ -6045,25 +6045,25 @@ class IMAPAdapter(NoSQLAdapter):
add <timedelta> adds to the date object
"""
months = [None, "Jan","Feb","Mar","Apr","May","Jun",
"Jul", "Aug","Sep","Oct","Nov","Dec"]
months = [None, "JAN","FEB","MAR","APR","MAY","JUN",
"JUL", "AUG","SEP","OCT","NOV","DEC"]
if isinstance(date, basestring):
# Prevent unexpected date response format
try:
dayname, datestring = date.split(",")
except (ValueError):
LOGGER.debug("Could not parse date text: %s" % date)
date_list = datestring.strip().split()
year = int(date_list[2])
month = months.index(date_list[1].upper())
day = int(date_list[0])
hms = map(int, date_list[3].split(":"))
return datetime.datetime(year, month, day,
hms[0], hms[1], hms[2]) + add
except (ValueError, AttributeError, IndexError), e:
LOGGER.error("Could not parse date text: %s. %s" %
(date, e))
return None
date_list = datestring.strip().split()
year = int(date_list[2])
month = months.index(date_list[1])
day = int(date_list[0])
hms = map(int, date_list[3].split(":"))
return datetime.datetime(year, month, day,
hms[0], hms[1], hms[2]) + add
elif isinstance(date, (datetime.datetime, datetime.date)):
return (date + add).strftime("%d-%b-%Y")
else:
return None