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

Reformat offlineimap/imaplibutil.py

Browse Source 
Add some spaces, remove lines,... now format is better (lintian).
This commit is contained in:
Rodolfo García Peñas (kix) 2020-08-29 20:17:18 +02:00
parent ba9a3ce819
commit 20a9837e26
1 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
offlineimap/imaplibutil.py
View File

@ -46,8 +46,8 @@ class UsefulIMAPMixIn(object):
selected or raises an :exc:`OfflineImapError`.""" selected or raises an :exc:`OfflineImapError`."""
if self.__getselectedfolder() == mailbox and \ if self.__getselectedfolder() == mailbox and \
self.is_readonly == readonly and \ self.is_readonly == readonly and \
not force: not force:
# No change; return. # No change; return.
return return
try: try:
@ -57,16 +57,16 @@ class UsefulIMAPMixIn(object):
raise raise
except self.abort as e: except self.abort as e:
# self.abort is raised when we are supposed to retry # self.abort is raised when we are supposed to retry
errstr = "Server '%s' closed connection, error on SELECT '%s'. Ser"\ errstr = "Server '%s' closed connection, error on SELECT '%s'. Ser" \
"ver said: %s" % (self.host, mailbox, e.args[0]) "ver said: %s" % (self.host, mailbox, e.args[0])
severity = OfflineImapError.ERROR.FOLDER_RETRY severity = OfflineImapError.ERROR.FOLDER_RETRY
six.reraise(OfflineImapError, six.reraise(OfflineImapError,
OfflineImapError(errstr, severity), OfflineImapError(errstr, severity),
exc_info()[2]) exc_info()[2])
if result[0] != 'OK': if result[0] != 'OK':
#in case of error, bail out with OfflineImapError # in case of error, bail out with OfflineImapError
errstr = "Error SELECTing mailbox '%s', server reply:\n%s" %\ errstr = "Error SELECTing mailbox '%s', server reply:\n%s" % \
(mailbox, result) (mailbox, result)
severity = OfflineImapError.ERROR.FOLDER severity = OfflineImapError.ERROR.FOLDER
raise OfflineImapError(errstr, severity) raise OfflineImapError(errstr, severity)
return result return result
@ -133,7 +133,7 @@ class IMAP4_Tunnel(UsefulIMAPMixIn, IMAP4):
self.host = host self.host = host
self.process = subprocess.Popen(host, shell=True, close_fds=True, self.process = subprocess.Popen(host, shell=True, close_fds=True,
stdin=subprocess.PIPE, stdout=subprocess.PIPE) stdin=subprocess.PIPE, stdout=subprocess.PIPE)
(self.outfd, self.infd) = (self.process.stdin, self.process.stdout) (self.outfd, self.infd) = (self.process.stdin, self.process.stdout)
# imaplib2 polls on this fd # imaplib2 polls on this fd
self.read_fd = self.infd.fileno() self.read_fd = self.infd.fileno()
@ -176,12 +176,12 @@ class IMAP4_Tunnel(UsefulIMAPMixIn, IMAP4):
def new_mesg(self, s, tn=None, secs=None): def new_mesg(self, s, tn=None, secs=None):
if secs is None: if secs is None:
secs = time.time() secs = time.time()
if tn is None: if tn is None:
tn = threading.currentThread().getName() tn = threading.currentThread().getName()
tm = time.strftime('%M:%S', time.localtime(secs)) tm = time.strftime('%M:%S', time.localtime(secs))
getglobalui().debug('imap', ' %s.%02d %s %s' % (tm, (secs*100)%100, tn, s)) getglobalui().debug('imap', ' %s.%02d %s %s' % (tm, (secs * 100) % 100, tn, s))
class WrappedIMAP4_SSL(UsefulIMAPMixIn, IMAP4_SSL): class WrappedIMAP4_SSL(UsefulIMAPMixIn, IMAP4_SSL):
@ -204,9 +204,9 @@ class WrappedIMAP4_SSL(UsefulIMAPMixIn, IMAP4_SSL):
def open(self, host=None, port=None): def open(self, host=None, port=None):
if not self.ca_certs and not self._fingerprint: if not self.ca_certs and not self._fingerprint:
raise OfflineImapError("No CA certificates " raise OfflineImapError("No CA certificates "
"and no server fingerprints configured. " "and no server fingerprints configured. "
"You must configure at least something, otherwise " "You must configure at least something, otherwise "
"having SSL helps nothing.", OfflineImapError.ERROR.REPO) "having SSL helps nothing.", OfflineImapError.ERROR.REPO)
super(WrappedIMAP4_SSL, self).open(host, port) super(WrappedIMAP4_SSL, self).open(host, port)
if self._fingerprint: if self._fingerprint:
server_cert = self.sock.getpeercert(True) server_cert = self.sock.getpeercert(True)
@ -216,12 +216,13 @@ class WrappedIMAP4_SSL(UsefulIMAPMixIn, IMAP4_SSL):
matches = [(server_fingerprint in self._fingerprint) for server_fingerprint in server_fingerprints] matches = [(server_fingerprint in self._fingerprint) for server_fingerprint in server_fingerprints]
if not any(matches): if not any(matches):
raise OfflineImapError("Server SSL fingerprint(s) '%s' " raise OfflineImapError("Server SSL fingerprint(s) '%s' "
"for hostname '%s' " "for hostname '%s' "
"does not match configured fingerprint(s) %s. " "does not match configured fingerprint(s) %s. "
"Please verify and set 'cert_fingerprint' accordingly " "Please verify and set 'cert_fingerprint' accordingly "
"if not set yet."% "if not set yet." %
(list(zip([hash.__name__ for hash in hashes], server_fingerprints)), host, self._fingerprint), (list(zip([hash.__name__ for hash in hashes], server_fingerprints)), host,
OfflineImapError.ERROR.REPO) self._fingerprint),
OfflineImapError.ERROR.REPO)
class WrappedIMAP4(UsefulIMAPMixIn, IMAP4): class WrappedIMAP4(UsefulIMAPMixIn, IMAP4):
@ -264,7 +265,7 @@ def Internaldate2epoch(resp):
# INTERNALDATE timezone must be subtracted to get UT # INTERNALDATE timezone must be subtracted to get UT
zone = (zoneh*60 + zonem)*60 zone = (zoneh * 60 + zonem) * 60
if zonen == '-': if zonen == '-':
zone = -zone zone = -zone