From d900ebf0eb88db4d52a5c5b6a3049a9ca880f6da Mon Sep 17 00:00:00 2001
From: Sean Whalen <whalenster@gmail.com>
Date: Tue, 6 Mar 2018 10:01:27 -0500
Subject: [PATCH] 2.1.2

---
 CHANGELOG.md  |  8 ++++++++
 parsedmarc.py | 12 ++++++------
 tests.py      |  2 +-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f2301b7..ee5d8b0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+2.1.2
+-----
+- Rename `parsed_dmarc_forensic_reports_to_csv()` to
+ `parsed_forensic_reports_to_csv()` to match other functions
+- Rename `parsed_aggregate_report_to_csv()` to
+ `parsed_aggregate_reports_to_csv()` to match other functions
+- Use local time when generating the default email subject
+
 2.1.1
 -----
 - Documentation fixes
diff --git a/parsedmarc.py b/parsedmarc.py
index cc6f3f5..281c209 100644
--- a/parsedmarc.py
+++ b/parsedmarc.py
@@ -44,7 +44,7 @@ import imapclient.exceptions
 import dateparser
 import mailparser
 
-__version__ = "2.1.1"
+__version__ = "2.1.2"
 
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.INFO)
@@ -541,7 +541,7 @@ def parse_aggregate_report_file(_input, nameservers=None, timeout=6.0):
                                       timeout=timeout)
 
 
-def parsed_aggregate_report_to_csv(reports):
+def parsed_aggregate_reports_to_csv(reports):
     """
     Converts one or more parsed aggregate reports to flat CSV format, including
     headers
@@ -798,7 +798,7 @@ def parse_forensic_report(feedback_report, sample, sample_headers_only,
             error.__str__()))
 
 
-def parsed_dmarc_forensic_reports_to_csv(reports):
+def parsed_forensic_reports_to_csv(reports):
     """
     Converts one or more parsed forensic reports to flat CSV format, including
     headers
@@ -1129,7 +1129,7 @@ def save_output(results, output_directory="output"):
 
     with open("{0}".format(os.path.join(output_directory, "aggregate.csv")),
               "w", newline="\n", encoding="utf-8") as agg_csv:
-        csv = parsed_aggregate_report_to_csv(aggregate_reports)
+        csv = parsed_aggregate_reports_to_csv(aggregate_reports)
         agg_csv.write(csv)
 
     with open("{0}".format(os.path.join(output_directory, "forensic.json")),
@@ -1139,7 +1139,7 @@ def save_output(results, output_directory="output"):
 
     with open("{0}".format(os.path.join(output_directory, "forensic.csv")),
               "w", newline="\n", encoding="utf-8") as for_csv:
-        csv = parsed_dmarc_forensic_reports_to_csv(forensic_reports)
+        csv = parsed_forensic_reports_to_csv(forensic_reports)
         for_csv.write(csv)
 
     samples_directory = os.path.join(output_directory, "samples")
@@ -1232,7 +1232,7 @@ def email_results(results, host, mail_from, mail_to, port=0, starttls=True,
         message: Override the default plain text body
         ssl_context: SSL context options
     """
-    date_string = datetime.utcnow().strftime("%Y-%m-%d")
+    date_string = datetime.now().strftime("%Y-%m-%d")
     if attachment_filename:
         if not attachment_filename.lower().endswith(".zip"):
             attachment_filename += ".zip"
diff --git a/tests.py b/tests.py
index d40e58a..a762ec5 100644
--- a/tests.py
+++ b/tests.py
@@ -16,7 +16,7 @@ class Test(unittest.TestCase):
             parsed_report = parsedmarc.parse_aggregate_report_file(sample_path)
             print(json.dumps(parsed_report, ensure_ascii=False, indent=2))
             print("\n")
-            print(parsedmarc.parsed_aggregate_report_to_csv(parsed_report))
+            print(parsedmarc.parsed_aggregate_reports_to_csv(parsed_report))
 
 
 if __name__ == "__main__":