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

IMAP google code issue 1707: fixed patch

Browse Source
This commit is contained in:
spametki
2013-10-06 14:39:23 -03:00
parent e05fe15470
commit e7fbd0095f
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/dal.py
+9 -4
View File
@@ -6124,7 +6124,7 @@ class IMAPAdapter(NoSQLAdapter):
else: else:
return (uid_list[0], uid_list[-1]) return (uid_list[0], uid_list[-1])
def convert_date(self, date, add=None): def convert_date(self, date, add=None, imf=False):
if add is None: if add is None:
add = datetime.timedelta() add = datetime.timedelta()
""" Convert a date object to a string """ Convert a date object to a string
@@ -6138,7 +6138,10 @@ class IMAPAdapter(NoSQLAdapter):
if isinstance(date, basestring): if isinstance(date, basestring):
# Prevent unexpected date response format # Prevent unexpected date response format
try: try:
dayname, datestring = date.split(",") if "," in date:
dayname, datestring = date.split(",")
else:
dayname, datestring = None, date
date_list = datestring.strip().split() date_list = datestring.strip().split()
year = int(date_list[2]) year = int(date_list[2])
month = months.index(date_list[1].upper()) month = months.index(date_list[1].upper())
@@ -6151,7 +6154,9 @@ class IMAPAdapter(NoSQLAdapter):
(date, e)) (date, e))
return None return None
elif isinstance(date, (datetime.date, datetime.datetime)): elif isinstance(date, (datetime.date, datetime.datetime)):
return (date + add).strftime("%a, %d %b %Y %H:%M:%S %z") if imf: date_format = "%a, %d %b %Y %H:%M:%S %z"
else: date_format = "%d-%b-%Y"
return (date + add).strftime(date_format)
else: else:
return None return None
@@ -6548,7 +6553,7 @@ class IMAPAdapter(NoSQLAdapter):
message = Message() message = Message()
message["from"] = d.get("sender", "") message["from"] = d.get("sender", "")
message["subject"] = d.get("subject", "") message["subject"] = d.get("subject", "")
message["date"] = self.convert_date(date_time) message["date"] = self.convert_date(date_time, imf=True)
if mime: if mime:
message.set_type(mime) message.set_type(mime)