Drop Python 2 support

Author: oschwald

.travis.yml

@@ -2,16 +2,13 @@
 language: python
 matrix:
   include:
-    - python: 2.7
-    - python: 3.5
     - python: 3.6
     - python: 3.7
     - python: 3.8
       env:
         - RUN_SNYK=1
         - RUN_LINTER=1
     - python: nightly
-    - python: pypy
   allow_failures:
     - python: nightly
 

HISTORY.rst

@@ -3,6 +3,12 @@
 History
 -------
 
+4.0.0
+++++++++++++++++++
+
+* IMPORTANT: Python 2.7 and 3.5 support has been dropped. Python 3.6 or greater
+  is required.
+
 3.0.0 (2019-12-20)
 ++++++++++++++++++
 

README.rst

@@ -331,12 +331,11 @@ Database Reader Exceptions
 --------------------------
 
 If the database file does not exist or is not readable, the constructor will
-raise a ``FileNotFoundError`` on Python 3 or an ``IOError`` on Python 2.
-If the IP address passed to a method is invalid, a ``ValueError`` will be
-raised. If the file is invalid or there is a bug in the reader, a
-``maxminddb.InvalidDatabaseError`` will be raised with a description of the
-problem. If an IP address is not in the database, a ``AddressNotFoundError``
-will be raised.
+raise a ``FileNotFoundError``.  If the IP address passed to a method is
+invalid, a ``ValueError`` will be raised. If the file is invalid or there is a
+bug in the reader, a ``maxminddb.InvalidDatabaseError`` will be raised with a
+description of the problem. If an IP address is not in the database, a
+``AddressNotFoundError`` will be raised.
 
 Values to use for Database or Dictionary Keys
 ---------------------------------------------
@@ -402,8 +401,7 @@ correction, please `contact MaxMind support
 Requirements
 ------------
 
-This code requires Python 2.7+ or 3.5+. Older versions are not supported.
-This library has been tested with CPython and PyPy.
+Python 3.6 or greater is required. Older versions are not supported.
 
 The Requests HTTP library is also required. See
 <http://python-requests.org> for details.

geoip2/compat.py

@@ -197,7 +197,7 @@ def _get(self, database_type, ip_address):
             raise geoip2.errors.AddressNotFoundError(
                 "The address %s is not in the database." % ip_address
             )
-        return (record, prefix_len)
+        return record, prefix_len
 
     def _model_for(self, model_class, types, ip_address):
         (record, prefix_len) = self._get(types, ip_address)

geoip2/database.py

@@ -15,7 +15,6 @@
 from abc import ABCMeta
 
 import geoip2.records
-from geoip2.compat import compat_ip_network
 from geoip2.mixins import SimpleEquality
 
 
@@ -331,7 +330,7 @@ def network(self):
         prefix_len = self._prefix_len
         if ip_address is None or prefix_len is None:
             return None
-        network = compat_ip_network("{}/{}".format(ip_address, prefix_len), False)
+        network = ipaddress.ip_network("{}/{}".format(ip_address, prefix_len), False)
         self._network = network
         return network
 

geoip2/models.py

@@ -11,7 +11,6 @@
 # pylint:disable=R0903
 from abc import ABCMeta
 
-from geoip2.compat import compat_ip_network
 from geoip2.mixins import SimpleEquality
 
 
@@ -799,6 +798,6 @@ def network(self):
             if ip_address is None or prefix_len is None:
                 return None
             network = "{}/{}".format(ip_address, prefix_len)
-        network = compat_ip_network(network, False)
+        network = ipaddress.ip_network(network, False)
         self._network = network
         return network

geoip2/records.py

@@ -25,15 +25,13 @@
 
 """
 
+import ipaddress
 import requests
-
 from requests.utils import default_user_agent
 
 import geoip2
 import geoip2.models
 
-from .compat import compat_ip_address
-
 from .errors import (
     AddressNotFoundError,
     AuthenticationError,
@@ -159,7 +157,7 @@ def insights(self, ip_address="me"):
 
     def _response_for(self, path, model_class, ip_address):
         if ip_address != "me":
-            ip_address = str(compat_ip_address(ip_address))
+            ip_address = str(ipaddress.ip_address(ip_address))
         uri = "/".join([self._base_uri, path, ip_address])
         response = requests.get(
             uri,

geoip2/webservice.py

@@ -1,11 +1,12 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
+import copy
+import ipaddress
 import sys
 
 sys.path.append("..")
 
-import copy
 import geoip2
 import requests_mock
 from geoip2.errors import (
@@ -18,7 +19,6 @@
     PermissionRequiredError,
 )
 from geoip2.webservice import Client
-from geoip2.compat import compat_ip_network
 
 if sys.version_info[:2] == (2, 6):
     import unittest2 as unittest
@@ -106,7 +106,7 @@ def test_country_ok(self, mock):
             "registered_country is_in_european_union is True",
         )
         self.assertEqual(
-            country.traits.network, compat_ip_network("1.2.3.0/24"), "network"
+            country.traits.network, ipaddress.ip_network("1.2.3.0/24"), "network"
         )
         self.assertEqual(country.raw, self.country, "raw response is correct")
 
@@ -315,7 +315,7 @@ def test_city_ok(self, mock):
         city = self.client.city("1.2.3.4")
         self.assertEqual(type(city), geoip2.models.City, "return value of client.city")
         self.assertEqual(
-            city.traits.network, compat_ip_network("1.2.3.0/24"), "network"
+            city.traits.network, ipaddress.ip_network("1.2.3.0/24"), "network"
         )
 
     @requests_mock.mock()
@@ -331,7 +331,7 @@ def test_insights_ok(self, mock):
             type(insights), geoip2.models.Insights, "return value of client.insights"
         )
         self.assertEqual(
-            insights.traits.network, compat_ip_network("1.2.3.0/24"), "network"
+            insights.traits.network, ipaddress.ip_network("1.2.3.0/24"), "network"
         )
         self.assertEqual(insights.traits.static_ip_score, 1.3, "static_ip_score is 1.3")
         self.assertEqual(insights.traits.user_count, 2, "user_count is 2")