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

Merge pull request #98 from nicolas33/706-int-not-subscriptable 

don't fail to report error when exception args are not as expected
This commit is contained in:
Rodolfo García Peñas (kix) 2022-03-25 11:42:21 +01:00 committed by GitHub
parent 725022991a f418754087
commit b5001c2ae7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
offlineimap/imapserver.py
View File

@ -648,7 +648,7 @@ class IMAPServer:
(self.hostname, self.repos)
raise OfflineImapError(reason, severity, exc_info()[2])
elif isinstance(e, SSLError) and e.errno == errno.EPERM:
if isinstance(e, SSLError) and e.errno == errno.EPERM:
# SSL unknown protocol error
# happens e.g. when connecting via SSL to a non-SSL service
if self.port != 993:
@ -662,7 +662,7 @@ class IMAPServer:
% (self.hostname, self.repos, e)
raise OfflineImapError(reason, severity, exc_info()[2])
elif isinstance(e, socket.error) and e.args and e.args[0] == errno.ECONNREFUSED:
if isinstance(e, socket.error) and e.args and e.args[0] == errno.ECONNREFUSED:
# "Connection refused", can be a non-existing port, or an unauthorized
# webproxy (open WLAN?)
reason = "Connection to host '%s:%d' for repository '%s' was " \
@ -679,16 +679,20 @@ class IMAPServer:
"for repository '%s'. Remote does not answer." % (self.hostname, self.repos),
OfflineImapError.ERROR.REPO,
exc_info()[2])
elif e.args and \
e.args[0][:35] == 'IMAP4 protocol error: socket error:':
raise OfflineImapError(
"Could not connect to remote server '{}' "
"for repository '{}'. Connection Refused.".format(
self.hostname, self.repos),
OfflineImapError.ERROR.CRITICAL)
else:
# re-raise all other errors
raise
if e.args:
try:
if e.args[0][:35] == 'IMAP4 protocol error: socket error:':
raise OfflineImapError(
"Could not connect to remote server '{}' "
"for repository '{}'. Connection Refused.".format(
self.hostname, self.repos),
OfflineImapError.ERROR.CRITICAL)
except:
pass
e.args[0][:35]
# re-raise all other errors
raise
def connectionwait(self):
"""Waits until there is a connection available.