From 293dfc46b7fd0c28d4213625387981946a1aef2b Mon Sep 17 00:00:00 2001
From: Sean Whalen <44679+seanthegeek@users.noreply.github.com>
Date: Wed, 5 Jan 2022 10:21:25 -0500
Subject: [PATCH] PEP8 code style fixes

---
 parsedmarc/__init__.py | 13 ++++++++-----
 parsedmarc/cli.py      |  6 ++++--
 parsedmarc/syslog.py   |  4 +++-
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/parsedmarc/__init__.py b/parsedmarc/__init__.py
index 1c504ec..f7d5116 100644
--- a/parsedmarc/__init__.py
+++ b/parsedmarc/__init__.py
@@ -205,8 +205,9 @@ def _parse_report_record(record, ip_db_path=None, offline=False,
     return new_record
 
 
-def parse_aggregate_report_xml(xml, ip_db_path=None, offline=False, nameservers=None,
-                               timeout=2.0, parallel=False, server=None):
+def parse_aggregate_report_xml(xml, ip_db_path=None, offline=False,
+                               nameservers=None, timeout=2.0,
+                               parallel=False, server=None):
     """Parses a DMARC XML report string and returns a consistent OrderedDict
 
     Args:
@@ -567,7 +568,8 @@ def parsed_aggregate_reports_to_csv(reports):
 
 
 def parse_forensic_report(feedback_report, sample, msg_date,
-                          offline=False, ip_db_path=None, nameservers=None, dns_timeout=2.0,
+                          offline=False, ip_db_path=None,
+                          nameservers=None, dns_timeout=2.0,
                           strip_attachment_payloads=False,
                           parallel=False):
     """
@@ -756,8 +758,9 @@ def parsed_forensic_reports_to_csv(reports):
     return csv_file.getvalue()
 
 
-def parse_report_email(input_, offline=False, ip_db_path=None, nameservers=None,
-                       dns_timeout=2.0, strip_attachment_payloads=False,
+def parse_report_email(input_, offline=False, ip_db_path=None,
+                       nameservers=None, dns_timeout=2.0,
+                       strip_attachment_payloads=False,
                        parallel=False, server=None):
     """
     Parses a DMARC report from an email
diff --git a/parsedmarc/cli.py b/parsedmarc/cli.py
index e125c9b..de572da 100644
--- a/parsedmarc/cli.py
+++ b/parsedmarc/cli.py
@@ -689,9 +689,11 @@ def _main():
                 forensic_reports.append(result[0]["report"])
 
     for mbox_path in mbox_paths:
-        reports = get_dmarc_reports_from_mbox(mbox_path, nameservers=opts.nameservers,
+        strip = opts.strip_attachment_payloads
+        reports = get_dmarc_reports_from_mbox(mbox_path,
+                                              nameservers=opts.nameservers,
                                               dns_timeout=opts.dns_timeout,
-                                              strip_attachment_payloads=opts.strip_attachment_payloads,
+                                              strip_attachment_payloads=strip,
                                               ip_db_path=opts.ip_db_path,
                                               offline=opts.offline, parallel=False)
         aggregate_reports += reports["aggregate_reports"]
diff --git a/parsedmarc/syslog.py b/parsedmarc/syslog.py
index cf9e000..6e4d14a 100644
--- a/parsedmarc/syslog.py
+++ b/parsedmarc/syslog.py
@@ -8,6 +8,7 @@ from parsedmarc import parsed_aggregate_reports_to_csv_rows, parsed_forensic_rep
 
 logger = logging.getLogger("parsedmarc")
 
+
 class SyslogClient(object):
     """A client for Syslog"""
 
@@ -22,7 +23,8 @@ class SyslogClient(object):
         self.server_port = server_port
         self.logger = logging.getLogger('parsedmarc_syslog')
         self.logger.setLevel(logging.INFO)
-        log_handler = logging.handlers.SysLogHandler(address = (server_name,server_port))
+        log_handler = logging.handlers.SysLogHandler(address=(server_name,
+                                                              server_port))
         self.logger.addHandler(log_handler)
 
     def save_aggregate_report_to_syslog(self, aggregate_reports):