From f19ea5b950f943af9671ab9b5906a8cae3aef0ce Mon Sep 17 00:00:00 2001
From: Sean Whalen <whalenster@gmail.com>
Date: Mon, 26 Nov 2018 15:01:22 -0500
Subject: [PATCH] 5.0.2 - Revert to using `publicsuffix` instead of
 `publicsuffix2`

---
 CHANGELOG.md           | 5 +++++
 parsedmarc/__init__.py | 2 +-
 parsedmarc/utils.py    | 6 +++---
 requirements.txt       | 2 +-
 setup.py               | 4 ++--
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c667623..a89de07 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+5.0.2
+-----
+
+- Revert to using `publicsuffix` instead of `publicsuffix2`
+
 5.0.1
 -----
 
diff --git a/parsedmarc/__init__.py b/parsedmarc/__init__.py
index 9cb346b..b3797c5 100644
--- a/parsedmarc/__init__.py
+++ b/parsedmarc/__init__.py
@@ -38,7 +38,7 @@ 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
 
-__version__ = "5.0.1"
+__version__ = "5.0.2"
 
 logger = logging.getLogger("parsedmarc")
 logger.debug("parsedmarc v{0}".format(__version__))
diff --git a/parsedmarc/utils.py b/parsedmarc/utils.py
index f837e6c..c1751bf 100644
--- a/parsedmarc/utils.py
+++ b/parsedmarc/utils.py
@@ -23,9 +23,9 @@ import dns.exception
 import geoip2.database
 import geoip2.errors
 import requests
-import publicsuffix2
+import publicsuffix
 
-__version__ = "4.3.9"
+__version__ = "5.0.2"
 
 USER_AGENT = "Mozilla/5.0 ((0 {1})) parsedmarc/{2}".format(
             platform.system(),
@@ -99,7 +99,7 @@ def get_base_domain(domain):
                 logger.warning(
                     "Failed to download an updated PSL {0}".format(error))
     with open(psl_path, encoding="utf-8") as psl_file:
-        psl = publicsuffix2.PublicSuffixList(psl_file)
+        psl = publicsuffix.PublicSuffixList(psl_file)
 
     return psl.get_public_suffix(domain)
 
diff --git a/requirements.txt b/requirements.txt
index d78a0bf..cb88f88 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@ dnspython
 expiringdict
 urllib3<1.24,>=1.21.1
 requests
-publicsuffix2
+publicsuffix
 xmltodict
 geoip2
 dnspython
diff --git a/setup.py b/setup.py
index 090a13d..27bf054 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@ from setuptools import setup
 from codecs import open
 from os import path
 
-__version__ = "5.0.1"
+__version__ = "5.0.2"
 
 description = "A Python package and CLI for parsing aggregate and " \
               "forensic DMARC reports"
@@ -92,7 +92,7 @@ setup(
     # your project is installed. For an analysis of "install_requires" vs pip's
     # requirements files see:
     # https://packaging.python.org/en/latest/requirements.html
-    install_requires=['dnspython', 'expiringdict', 'publicsuffix2',
+    install_requires=['dnspython', 'expiringdict', 'publicsuffix',
                       'xmltodict', 'geoip2', 'urllib3<1.24,>=1.21.1',
                       'requests', 'imapclient', 'mail-parser', 'dateparser',
                       'elasticsearch==6.3.1',