From ca0e992c903b30fca0bec22a488db7927de28b9e Mon Sep 17 00:00:00 2001 From: Sean Whalen Date: Wed, 17 Jul 2019 06:46:23 -0400 Subject: [PATCH] Make argsmatch --- parsedmarc/__init__.py | 8 ++++---- parsedmarc/cli.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/parsedmarc/__init__.py b/parsedmarc/__init__.py index 6fd53ea..1f6f4d9 100644 --- a/parsedmarc/__init__.py +++ b/parsedmarc/__init__.py @@ -1199,7 +1199,7 @@ def get_report_zip(results): def email_results(results, host, mail_from, mail_to, mail_cc=None, mail_bcc=None, port=0, require_encryption=False, verify=True, - user=None, password=None, subject=None, + username=None, password=None, subject=None, attachment_filename=None, message=None): """ Emails parsing results as a zip file @@ -1214,7 +1214,7 @@ def email_results(results, host, mail_from, mail_to, port (int): Port to use require_encryption (bool): Require a secure connection from the start verify (bool): verify the SSL/TLS certificate - user (str): An optional username + username (str): An optional username password (str): An optional password subject (str): Overrides the default message subject attachment_filename (str): Override the default attachment filename @@ -1238,8 +1238,8 @@ def email_results(results, host, mail_from, mail_to, zip_bytes = get_report_zip(results) attachments = [(filename, zip_bytes)] - send_email(host, mail_from, mail_to, message_cc=mail_cc, + send_email(host, mail_from, mail_to, message_cc=mail_cc, message_bcc=mail_bcc, port=port, require_encryption=require_encryption, verify=verify, - user=user, password=password, subject=subject, + username=username, password=password, subject=subject, attachments=attachments, plain_message=message) diff --git a/parsedmarc/cli.py b/parsedmarc/cli.py index 7c48cd9..cf2803c 100644 --- a/parsedmarc/cli.py +++ b/parsedmarc/cli.py @@ -586,7 +586,7 @@ def _main(): verify = False email_results(results, opts.smtp_host, opts.smtp_from, opts.smtp_to, verify=verify, - user=opts.smtp_user, + username=opts.smtp_user, password=opts.smtp_password, subject=opts.smtp_subject) except Exception as error: