remove uneeded print and fix merge fail

This commit is contained in:
phail 2022-04-14 00:19:30 +02:00
parent 942b5aa9df
commit 5fcf1b5434

View File

@ -90,18 +90,14 @@ def make_criterias(rule):
def get_mailbox(server, port, security):
try:
if security == MailAccount.IMAP_SECURITY_NONE:
mailbox = MailBoxUnencrypted(server, port)
elif security == MailAccount.IMAP_SECURITY_STARTTLS:
mailbox = MailBoxTls(server, port)
elif security == MailAccount.IMAP_SECURITY_SSL:
mailbox = MailBox(server, port)
else:
raise NotImplementedError("Unknown IMAP security") # pragma: nocover
except Exception as e:
print(f"Error while retrieving mailbox from {server}: {e}")
raise
if security == MailAccount.ImapSecurity.NONE:
mailbox = MailBoxUnencrypted(server, port)
elif security == MailAccount.ImapSecurity.STARTTLS:
mailbox = MailBoxTls(server, port)
elif security == MailAccount.ImapSecurity.SSL:
mailbox = MailBox(server, port)
else:
raise NotImplementedError("Unknown IMAP security") # pragma: nocover
return mailbox