From 47598d9de9f667fdc4116ecb27a56687a461ed3f Mon Sep 17 00:00:00 2001 From: Sean Whalen Date: Sat, 16 Feb 2019 15:37:14 -0500 Subject: [PATCH] 6.1.8 - Actually fix GeoIP lookups --- CHANGELOG.md | 5 +++++ parsedmarc/__init__.py | 2 +- parsedmarc/utils.py | 2 +- setup.py | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 92fc4ea..f0ad0b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +6.1.8 +----- + +- Actually fix GeoIP lookups + 6.1.7 ----- diff --git a/parsedmarc/__init__.py b/parsedmarc/__init__.py index c495b2d..1514a8e 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__ = "6.1.7" +__version__ = "6.1.8" logging.basicConfig( format='%(levelname)8s:%(filename)s:%(lineno)d:' diff --git a/parsedmarc/utils.py b/parsedmarc/utils.py index 78cb7ea..9d9dfbe 100644 --- a/parsedmarc/utils.py +++ b/parsedmarc/utils.py @@ -288,7 +288,7 @@ def get_ip_address_country(ip_address): system_paths = ["/usr/local/share/GeoIP/GeoLite2-Country.mmdb", "/usr/share/GeoIP/GeoLite2-Country.mmdb", - "/var/lib/GeoIP/GeoLite2-Country.mmdb" + "/var/lib/GeoIP/GeoLite2-Country.mmdb", "C:\\GeoIP\\GeoLite2-Country.mmdb"] db_path = None diff --git a/setup.py b/setup.py index 75fee9c..2959e13 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ from setuptools import setup from codecs import open from os import path -__version__ = "6.1.7" +__version__ = "6.1.8" description = "A Python package and CLI for parsing aggregate and " \ "forensic DMARC reports"