tobias/docker-offlineimap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

folder/IMAP: code style

Browse Source 
Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
This commit is contained in:
Nicolas Sebrecht 2016-07-28 06:51:47 +02:00
parent 894745e657
commit 0ef11a8392
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
offlineimap/folder/IMAP.py
View File

@ -139,9 +139,10 @@ class IMAPFolder(BaseFolder):
self.imapserver.releaseconnection(imapobj, True) self.imapserver.releaseconnection(imapobj, True)
if e.severity == OfflineImapError.ERROR.FOLDER_RETRY: if e.severity == OfflineImapError.ERROR.FOLDER_RETRY:
retry = True retry = True
else: raise else:
raise
except: except:
# cleanup and raise on all other errors # Cleanup and raise on all other errors.
self.imapserver.releaseconnection(imapobj, True) self.imapserver.releaseconnection(imapobj, True)
raise raise
# 1. Some mail servers do not return an EXISTS response # 1. Some mail servers do not return an EXISTS response
@ -349,7 +350,7 @@ class IMAPFolder(BaseFolder):
def __savemessage_searchforheader(self, imapobj, headername, headervalue): def __savemessage_searchforheader(self, imapobj, headername, headervalue):
self.ui.debug('imap', '__savemessage_searchforheader called for %s: %s'% \ self.ui.debug('imap', '__savemessage_searchforheader called for %s: %s'%
(headername, headervalue)) (headername, headervalue))
# Now find the UID it got. # Now find the UID it got.
headervalue = imapobj._quote(headervalue) headervalue = imapobj._quote(headervalue)
@ -358,20 +359,24 @@ class IMAPFolder(BaseFolder):
headername, headervalue)[1][0] headername, headervalue)[1][0]
except imapobj.error as err: except imapobj.error as err:
# IMAP server doesn't implement search or had a problem. # IMAP server doesn't implement search or had a problem.
self.ui.debug('imap', "__savemessage_searchforheader: got IMAP error '%s' while attempting to UID SEARCH for message with header %s"% (err, headername)) self.ui.debug('imap', "__savemessage_searchforheader: got IMAP "
"error '%s' while attempting to UID SEARCH for message with "
"header %s"% (err, headername))
return 0 return 0
self.ui.debug('imap', '__savemessage_searchforheader got initial matchinguids: ' + repr(matchinguids)) self.ui.debug('imap', "__savemessage_searchforheader got initial "
"matchinguids: " + repr(matchinguids))
if matchinguids == '': if matchinguids == '':
self.ui.debug('imap', "__savemessage_searchforheader: UID SEARCH for message with header %s yielded no results"% headername) self.ui.debug('imap', "__savemessage_searchforheader: UID SEARCH "
"for message with header %s yielded no results"% headername)
return 0 return 0
matchinguids = matchinguids.split(' ') matchinguids = matchinguids.split(' ')
self.ui.debug('imap', '__savemessage_searchforheader: matchinguids now ' + \ self.ui.debug('imap', '__savemessage_searchforheader: matchinguids now '
repr(matchinguids)) + repr(matchinguids))
if len(matchinguids) != 1 or matchinguids[0] == None: if len(matchinguids) != 1 or matchinguids[0] is None:
raise ValueError("While attempting to find UID for message with " raise ValueError("While attempting to find UID for message with "
"header %s, got wrong-sized matchinguids of %s"%\ "header %s, got wrong-sized matchinguids of %s"%
(headername, str(matchinguids))) (headername, str(matchinguids)))
return int(matchinguids[0]) return int(matchinguids[0])
@ -579,7 +584,7 @@ class IMAPFolder(BaseFolder):
(headername, headervalue)) (headername, headervalue))
content = self.addmessageheader(content, CRLF, headername, headervalue) content = self.addmessageheader(content, CRLF, headername, headervalue)
if len(content)>200: if len(content) > 200:
dbg_output = "%s...%s"% (content[:150], content[-50:]) dbg_output = "%s...%s"% (content[:150], content[-50:])
else: else:
dbg_output = content dbg_output = content
@ -678,7 +683,8 @@ class IMAPFolder(BaseFolder):
self.ui.warn('imap', "savemessage: Searching mails for new " self.ui.warn('imap', "savemessage: Searching mails for new "
"Message-ID failed. Could not determine new UID.") "Message-ID failed. Could not determine new UID.")
finally: finally:
if imapobj: self.imapserver.releaseconnection(imapobj) if imapobj:
self.imapserver.releaseconnection(imapobj)
if uid: # Avoid UID FETCH 0 crash happening later on if uid: # Avoid UID FETCH 0 crash happening later on
self.messagelist[uid] = self.msglist_item_initializer(uid) self.messagelist[uid] = self.msglist_item_initializer(uid)