diff --git a/_modules/index.html b/_modules/index.html
index 34dfe6c..777e667 100644
--- a/_modules/index.html
+++ b/_modules/index.html
@@ -8,7 +8,7 @@
- Overview: module code — parsedmarc 6.3.5 documentation
+ Overview: module code — parsedmarc 6.3.6 documentation
@@ -58,7 +58,7 @@
- 6.3.5
+ 6.3.6
diff --git a/_modules/parsedmarc.html b/_modules/parsedmarc.html
index 3774774..f5b8254 100644
--- a/_modules/parsedmarc.html
+++ b/_modules/parsedmarc.html
@@ -8,7 +8,7 @@
- parsedmarc — parsedmarc 6.3.5 documentation
+ parsedmarc — parsedmarc 6.3.6 documentation
@@ -58,7 +58,7 @@
- 6.3.5
+ 6.3.6
@@ -185,7 +185,7 @@
from parsedmarc.utils import timestamp_to_human, human_timestamp_to_datetime
from parsedmarc.utils import parse_email
-__version__ = "6.3.5"
+__version__ = "6.3.6"
logging.basicConfig(
format='%(levelname)8s:%(filename)s:%(lineno)d:'
@@ -1112,7 +1112,20 @@
logger.debug("Moving message UID(s) {0} to {1}".format(
",".join(str(uid) for uid in chunk), folder
))
- server.move(chunk, folder)
+ try:
+ server.move(chunk, folder)
+ except imapclient.exceptions.IMAPClientError as e:
+ e = e.__str__().lstrip("b'").rstrip(
+ "'").rstrip(".")
+ message = "Error moving message UID"
+ e = "{0} {1}: " "{2}".format(message, msg_uid, e)
+ logger.debug("IMAP error: {0}".format(e))
+ logger.debug(
+ "Copying message UID(s) {0} to {1}".format(
+ ",".join(str(uid) for uid in chunk), folder
+ ))
+ server.copy(msg_uids, folder)
+ delete_messages(msg_uids)
else:
logger.debug("Copying message UID(s) {0} to {1}".format(
",".join(str(uid) for uid in chunk), folder
@@ -1264,7 +1277,7 @@
if len(aggregate_report_msg_uids) > 0:
log_message = "Moving aggregate report messages from"
logger.debug(
- "{0} {1} to {1}".format(
+ "{0} {1} to {2}".format(
log_message, reports_folder,
aggregate_reports_folder))
number_of_agg_report_msgs = len(aggregate_report_msg_uids)
@@ -1832,7 +1845,7 @@
idle_start_time = time.monotonic()
for response in responses:
logging.debug("Received response: {0}".format(response))
- if response[0] > 0 and response[1] == b'RECENT':
+ if int(response[0]) > 0 and response[1] == b'RECENT':
server.idle_done()
res = get_dmarc_reports_from_inbox(connection=server,
move_supported=ms,
diff --git a/_modules/parsedmarc/elastic.html b/_modules/parsedmarc/elastic.html
index e0bdd21..15cdb81 100644
--- a/_modules/parsedmarc/elastic.html
+++ b/_modules/parsedmarc/elastic.html
@@ -8,7 +8,7 @@
- parsedmarc.elastic — parsedmarc 6.3.5 documentation
+ parsedmarc.elastic — parsedmarc 6.3.6 documentation
@@ -58,7 +58,7 @@
- 6.3.5
+ 6.3.6
diff --git a/_modules/parsedmarc/splunk.html b/_modules/parsedmarc/splunk.html
index ef30d1b..eb5b8de 100644
--- a/_modules/parsedmarc/splunk.html
+++ b/_modules/parsedmarc/splunk.html
@@ -8,7 +8,7 @@
- parsedmarc.splunk — parsedmarc 6.3.5 documentation
+ parsedmarc.splunk — parsedmarc 6.3.6 documentation
@@ -58,7 +58,7 @@
- 6.3.5
+ 6.3.6
diff --git a/_modules/parsedmarc/utils.html b/_modules/parsedmarc/utils.html
index 6cb37f4..378d0f6 100644
--- a/_modules/parsedmarc/utils.html
+++ b/_modules/parsedmarc/utils.html
@@ -8,7 +8,7 @@
- parsedmarc.utils — parsedmarc 6.3.5 documentation
+ parsedmarc.utils — parsedmarc 6.3.6 documentation
@@ -58,7 +58,7 @@
- 6.3.5
+ 6.3.6
diff --git a/_static/documentation_options.js b/_static/documentation_options.js
index 1d129b6..0e3e287 100644
--- a/_static/documentation_options.js
+++ b/_static/documentation_options.js
@@ -1,6 +1,6 @@
var DOCUMENTATION_OPTIONS = {
URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
- VERSION: '6.3.5',
+ VERSION: '6.3.6',
LANGUAGE: 'None',
COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html',
diff --git a/genindex.html b/genindex.html
index 6c63c47..bafd55f 100644
--- a/genindex.html
+++ b/genindex.html
@@ -9,7 +9,7 @@
- Index — parsedmarc 6.3.5 documentation
+ Index — parsedmarc 6.3.6 documentation
@@ -59,7 +59,7 @@
- 6.3.5
+ 6.3.6
diff --git a/index.html b/index.html
index 23b6686..0dbf761 100644
--- a/index.html
+++ b/index.html
@@ -8,7 +8,7 @@
- parsedmarc documentation - Open source DMARC report analyzer and visualizer — parsedmarc 6.3.5 documentation
+ parsedmarc documentation - Open source DMARC report analyzer and visualizer — parsedmarc 6.3.6 documentation
@@ -58,7 +58,7 @@
- 6.3.5
+ 6.3.6
diff --git a/objects.inv b/objects.inv
index ab603ca..31ec01c 100644
Binary files a/objects.inv and b/objects.inv differ
diff --git a/py-modindex.html b/py-modindex.html
index f25abef..d729e2d 100644
--- a/py-modindex.html
+++ b/py-modindex.html
@@ -8,7 +8,7 @@
- Python Module Index — parsedmarc 6.3.5 documentation
+ Python Module Index — parsedmarc 6.3.6 documentation
@@ -61,7 +61,7 @@
- 6.3.5
+ 6.3.6
diff --git a/search.html b/search.html
index d39003b..eb53eb5 100644
--- a/search.html
+++ b/search.html
@@ -8,7 +8,7 @@
- Search — parsedmarc 6.3.5 documentation
+ Search — parsedmarc 6.3.6 documentation
@@ -59,7 +59,7 @@
- 6.3.5
+ 6.3.6