amorfo77/parsedmarc
1
0
Fork 0
mirror of https://github.com/domainaware/parsedmarc.git synced 2026-05-19 18:35:24 +00:00
Code Issues Projects Releases Wiki Activity

Attempt to fix issue #53 without breaking anything else

Browse Source
This commit is contained in:
Sean Whalen
2019-02-08 09:03:16 -05:00
parent 9329feec1f
commit 21b6ccb427
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
parsedmarc/__init__.py
+4 -7
View File
@@ -995,7 +995,10 @@ def get_dmarc_reports_from_inbox(host=None,
raw_msg = raw_msg[msg_key]
except (ConnectionResetError, socket.error,
TimeoutError) as error:
TimeoutError,
imapclient.exceptions.IMAPClientError) as error:
error = error.__str__().lstrip("b'").rstrip("'").rstrip(
".")
logger.debug("IMAP error: {0}".format(error.__str__()))
logger.debug("Reconnecting to IMAP")
try:
@@ -1027,12 +1030,6 @@ def get_dmarc_reports_from_inbox(host=None,
elif parsed_email["report_type"] == "forensic":
forensic_reports.append(parsed_email["report"])
forensic_report_msg_uids.append(msg_uid)
except imapclient.exceptions.IMAPClientError as error:
error = error.__str__().lstrip("b'").rstrip("'").rstrip(".")
error = "IMAP error: Skipping message UID {0}: {1}".format(
msg_uid, error)
logger.error("IMAP error: {0}".format(error))
except InvalidDMARCReport as error:
logger.warning(error.__str__())
if not test: