From a50c0555799d3535a01e6299ef1c35fe32e63ff8 Mon Sep 17 00:00:00 2001 From: Sean Whalen Date: Fri, 12 Oct 2018 12:30:37 -0400 Subject: [PATCH] Update docs --- README.rst | 4 ++-- docs/index.rst | 10 ++++++++-- parsedmarc/__init__.py | 2 -- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/README.rst b/README.rst index 4072e27..61e940c 100644 --- a/README.rst +++ b/README.rst @@ -248,7 +248,7 @@ JSON CSV --- -:: +.. code-block:: xml_schema,org_name,org_email,org_extra_contact_info,report_id,begin_date,end_date,errors,domain,adkim,aspf,p,sp,pct,fo,source_ip_address,source_country,source_reverse_dns,source_base_domain,count,disposition,dkim_alignment,spf_alignment,policy_override_reasons,policy_override_comments,envelope_from,header_from,envelope_to,dkim_domains,dkim_selectors,dkim_results,spf_domains,spf_scopes,spf_results draft,acme.com,noreply-dmarc-support@acme.com,http://acme.com/dmarc/support,9391651994964116463,2012-04-27 20:00:00,2012-04-28 19:59:59,,example.com,r,r,none,none,100,0,72.150.241.94,US,adsl-72-150-241-94.shv.bellsouth.net,bellsouth.net,2,none,fail,pass,,,example.com,example.com,,example.com,none,fail,example.com,mfrom,pass @@ -357,7 +357,7 @@ JSON CSV --- -:: +.. code-block:: feedback_type,user_agent,version,original_envelope_id,original_mail_from,original_rcpt_to,arrival_date,arrival_date_utc,subject,message_id,authentication_results,dkim_domain,source_ip_address,source_country,source_reverse_dns,source_base_domain,delivery_result,auth_failure,reported_domain,authentication_mechanisms,sample_headers_only auth-failure,Lua/1.0,1.0,,sharepoint@domain.de,peter.pan@domain.de,"Mon, 01 Oct 2018 11:20:27 +0200",2018-10-01 09:20:27,Subject,<38.E7.30937.BD6E1BB5@ mailrelay.de>,"dmarc=fail (p=none, dis=none) header.from=domain.de",,10.10.10.10,,,,smg-policy-action,dmarc,domain.de,,False diff --git a/docs/index.rst b/docs/index.rst index 0057498..eb41836 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -253,7 +253,7 @@ JSON CSV --- -:: +.. code-block:: xml_schema,org_name,org_email,org_extra_contact_info,report_id,begin_date,end_date,errors,domain,adkim,aspf,p,sp,pct,fo,source_ip_address,source_country,source_reverse_dns,source_base_domain,count,disposition,dkim_alignment,spf_alignment,policy_override_reasons,policy_override_comments,envelope_from,header_from,envelope_to,dkim_domains,dkim_selectors,dkim_results,spf_domains,spf_scopes,spf_results draft,acme.com,noreply-dmarc-support@acme.com,http://acme.com/dmarc/support,9391651994964116463,2012-04-27 20:00:00,2012-04-28 19:59:59,,example.com,r,r,none,none,100,0,72.150.241.94,US,adsl-72-150-241-94.shv.bellsouth.net,bellsouth.net,2,none,fail,pass,,,example.com,example.com,,example.com,none,fail,example.com,mfrom,pass @@ -362,7 +362,7 @@ JSON CSV --- -:: +.. code-block:: feedback_type,user_agent,version,original_envelope_id,original_mail_from,original_rcpt_to,arrival_date,arrival_date_utc,subject,message_id,authentication_results,dkim_domain,source_ip_address,source_country,source_reverse_dns,source_base_domain,delivery_result,auth_failure,reported_domain,authentication_mechanisms,sample_headers_only auth-failure,Lua/1.0,1.0,,sharepoint@domain.de,peter.pan@domain.de,"Mon, 01 Oct 2018 11:20:27 +0200",2018-10-01 09:20:27,Subject,<38.E7.30937.BD6E1BB5@ mailrelay.de>,"dmarc=fail (p=none, dis=none) header.from=domain.de",,10.10.10.10,,,,smg-policy-action,dmarc,domain.de,,False @@ -1026,6 +1026,12 @@ parsedmarc.elastic .. automodule:: parsedmarc.elastic :members: +.. automodule:: parsedmarc.splunk + :members: + +.. automodule:: parsedmarc.utils + :members: + .. toctree:: :maxdepth: 2 :caption: Contents: diff --git a/parsedmarc/__init__.py b/parsedmarc/__init__.py index ea42797..1a5539e 100644 --- a/parsedmarc/__init__.py +++ b/parsedmarc/__init__.py @@ -30,14 +30,12 @@ import time import xmltodict import imapclient import imapclient.exceptions -import dateparser import mailparser from parsedmarc.__version__ import __version__ from parsedmarc.utils import get_base_domain, get_ip_address_info from parsedmarc.utils import is_outlook_msg, convert_outlook_msg from parsedmarc.utils import timestamp_to_human, human_timestamp_to_datetime -from parsedmarc.utils import parse_email, EmailParserError logger = logging.getLogger("parsedmarc") logger.debug("parsedmarc v{0}".format(__version__))