From 8ca62a986099f39f97fc116235ae30cdf41c089c Mon Sep 17 00:00:00 2001 From: Sean Whalen Date: Tue, 14 Jan 2020 12:42:45 -0500 Subject: [PATCH] 6.8.0 release --- docs/index.rst | 6 ++++-- parsedmarc/utils.py | 5 ++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/docs/index.rst b/docs/index.rst index 0ba2faf..6d43e85 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -493,7 +493,7 @@ On CentOS or RHEL systems, run: sudo yum install -y geoipupdate -Windows releases can be downloaded from the `releases page on GitHub`_. +The latest builds for Linux, macOS, and Windows can be downloaded from the `geoipupdate releases page on GitHub`_. On December 30th, 2019, MaxMind started requiring free accounts to access the free Geolite2 databases, in order `to comply with various privacy regulations`_. @@ -516,7 +516,7 @@ Then run To download the databases for the first time. The GeoLite2 Country, City, and ASN databases are updated weekly, every Tuesday. -``geoipupdate`` can be run weekly by adding a cron job. +``geoipupdate`` can be run weekly by adding a cron job or scheduled task. More information about ``geoipupdate`` can be found at the `MaxMind geoipupdate page`_ @@ -1577,6 +1577,8 @@ Indices and tables .. _MaxMind geoipupdate page: https://dev.maxmind.com/geoip/geoipupdate/ +.. _geoipupdate releases page on GitHub: https://github.com/maxmind/geoipupdate/releases + .. _download the latest portable Linux version of pypy3: https://github.com/squeaky-pl/portable-pypy#portable-pypy-distribution-for-linux .. _Elasticsearch: https://www.elastic.co/guide/en/elasticsearch/reference/current/rpm.html diff --git a/parsedmarc/utils.py b/parsedmarc/utils.py index 9147abe..4273b87 100644 --- a/parsedmarc/utils.py +++ b/parsedmarc/utils.py @@ -5,8 +5,6 @@ import os from datetime import datetime from datetime import timedelta from collections import OrderedDict -from io import BytesIO -import tarfile import tempfile import subprocess import shutil @@ -280,7 +278,8 @@ def get_ip_address_country(ip_address): "/usr/share/GeoIP/GeoLite2-Country.mmdb", "/var/lib/GeoIP/GeoLite2-Country.mmdb", "/var/local/lib/GeoIP/GeoLite2-Country.mmdb", - "%SystemDrive%\\ProgramData\\MaxMind\\GeoIPUpdate\\GeoIP\\GeoLite2-Country.mmdb" + "%SystemDrive%\\ProgramData\\" + "MaxMind\\GeoIPUpdate\\GeoIP\\GeoLite2-Country.mmdb" "C:\\GeoIP\\GeoLite2-Country.mmdb" ]