From 899dc060b222ca9de30b19c554c04288b227962a Mon Sep 17 00:00:00 2001
From: Sean Whalen <seanthegeek@users.noreply.github.com>
Date: Wed, 22 May 2024 09:06:32 -0400
Subject: [PATCH] pep8 fixes

---
 build.sh               |  2 +-
 parsedmarc/__init__.py | 71 ++++++++++++++++++++++--------------------
 parsedmarc/cli.py      | 19 +++++------
 3 files changed, 48 insertions(+), 44 deletions(-)

diff --git a/build.sh b/build.sh
index 34444f7..658ff78 100755
--- a/build.sh
+++ b/build.sh
@@ -8,13 +8,13 @@ fi
 
 . venv/bin/activate
 pip install -U -r requirements.txt
+flake8 parsedmarc
 cd docs
 make clean 
 make html
 touch build/html/.nojekyll
 cp -rf build/html/* ../../parsedmarc-docs/
 cd ..
-flake8 parsedmarc
 python3 tests.py
 rm -rf dist/ build/
 hatch build
\ No newline at end of file
diff --git a/parsedmarc/__init__.py b/parsedmarc/__init__.py
index bc9b94b..b5ed770 100644
--- a/parsedmarc/__init__.py
+++ b/parsedmarc/__init__.py
@@ -1331,15 +1331,16 @@ def get_dmarc_reports_from_mbox(input_, nameservers=None, dns_timeout=2.0,
             msg_content = mbox.get_string(message_key)
             try:
                 sa = strip_attachment_payloads
-                parsed_email = parse_report_email(msg_content,
-                                                  ip_db_path=ip_db_path,
-                                                  always_use_local_files=always_use_local_files,
-                                                  reverse_dns_map_path=reverse_dns_map_path,
-                                                  reverse_dns_map_url=reverse_dns_map_url,
-                                                  offline=offline,
-                                                  nameservers=nameservers,
-                                                  dns_timeout=dns_timeout,
-                                                  strip_attachment_payloads=sa)
+                parsed_email = parse_report_email(
+                    msg_content,
+                    ip_db_path=ip_db_path,
+                    always_use_local_files=always_use_local_files,
+                    reverse_dns_map_path=reverse_dns_map_path,
+                    reverse_dns_map_url=reverse_dns_map_url,
+                    offline=offline,
+                    nameservers=nameservers,
+                    dns_timeout=dns_timeout,
+                    strip_attachment_payloads=sa)
                 if parsed_email["report_type"] == "aggregate":
                     aggregate_reports.append(parsed_email["report"])
                 elif parsed_email["report_type"] == "forensic":
@@ -1447,16 +1448,17 @@ def get_dmarc_reports_from_mailbox(connection: MailboxConnection,
         msg_content = connection.fetch_message(msg_uid)
         try:
             sa = strip_attachment_payloads
-            parsed_email = parse_report_email(msg_content,
-                                              nameservers=nameservers,
-                                              dns_timeout=dns_timeout,
-                                              ip_db_path=ip_db_path,
-                                              always_use_local_files=always_use_local_files,
-                                              reverse_dns_map_path=reverse_dns_map_path,
-                                              reverse_dns_map_url=reverse_dns_map_url,
-                                              offline=offline,
-                                              strip_attachment_payloads=sa,
-                                              keep_alive=connection.keepalive)
+            parsed_email = parse_report_email(
+                msg_content,
+                nameservers=nameservers,
+                dns_timeout=dns_timeout,
+                ip_db_path=ip_db_path,
+                always_use_local_files=always_use_local_files,
+                reverse_dns_map_path=reverse_dns_map_path,
+                reverse_dns_map_url=reverse_dns_map_url,
+                offline=offline,
+                strip_attachment_payloads=sa,
+                keep_alive=connection.keepalive)
             if parsed_email["report_type"] == "aggregate":
                 aggregate_reports.append(parsed_email["report"])
                 aggregate_report_msg_uids.append(msg_uid)
@@ -1625,21 +1627,22 @@ def watch_inbox(mailbox_connection: MailboxConnection,
 
     def check_callback(connection):
         sa = strip_attachment_payloads
-        res = get_dmarc_reports_from_mailbox(connection=connection,
-                                             reports_folder=reports_folder,
-                                             archive_folder=archive_folder,
-                                             delete=delete,
-                                             test=test,
-                                             ip_db_path=ip_db_path,
-                                             always_use_local_files=always_use_local_files,
-                                             reverse_dns_map_path=reverse_dns_map_path,
-                                             reverse_dns_map_url=reverse_dns_map_url,
-                                             offline=offline,
-                                             nameservers=nameservers,
-                                             dns_timeout=dns_timeout,
-                                             strip_attachment_payloads=sa,
-                                             batch_size=batch_size,
-                                             create_folders=False)
+        res = get_dmarc_reports_from_mailbox(
+            connection=connection,
+            reports_folder=reports_folder,
+            archive_folder=archive_folder,
+            delete=delete,
+            test=test,
+            ip_db_path=ip_db_path,
+            always_use_local_files=always_use_local_files,
+            reverse_dns_map_path=reverse_dns_map_path,
+            reverse_dns_map_url=reverse_dns_map_url,
+            offline=offline,
+            nameservers=nameservers,
+            dns_timeout=dns_timeout,
+            strip_attachment_payloads=sa,
+            batch_size=batch_size,
+            create_folders=False)
         callback(res)
 
     mailbox_connection.watch(check_callback=check_callback,
diff --git a/parsedmarc/cli.py b/parsedmarc/cli.py
index 95101c5..d2ebae6 100644
--- a/parsedmarc/cli.py
+++ b/parsedmarc/cli.py
@@ -1209,15 +1209,16 @@ def _main():
 
     for mbox_path in mbox_paths:
         strip = opts.strip_attachment_payloads
-        reports = get_dmarc_reports_from_mbox(mbox_path,
-                                              nameservers=opts.nameservers,
-                                              dns_timeout=opts.dns_timeout,
-                                              strip_attachment_payloads=strip,
-                                              ip_db_path=opts.ip_db_path,
-                                              always_use_local_files=opts.always_use_local_files,
-                                              reverse_dns_map_path=opts.reverse_dns_map_path,
-                                              reverse_dns_map_url=opts.reverse_dns_map_url,
-                                              offline=opts.offline)
+        reports = get_dmarc_reports_from_mbox(
+            mbox_path,
+            nameservers=opts.nameservers,
+            dns_timeout=opts.dns_timeout,
+            strip_attachment_payloads=strip,
+            ip_db_path=opts.ip_db_path,
+            always_use_local_files=opts.always_use_local_files,
+            reverse_dns_map_path=opts.reverse_dns_map_path,
+            reverse_dns_map_url=opts.reverse_dns_map_url,
+            offline=opts.offline)
         aggregate_reports += reports["aggregate_reports"]
         forensic_reports += reports["forensic_reports"]
         smtp_tls_reports += reports["smtp_tls_reports"]