Use ipaddress on Python 2 to match maxminddb

Author: oschwald

geoip2/compat.py

@@ -0,0 +1,17 @@
+"""Intended for internal use only."""
+import sys
+
+import ipaddress
+
+# pylint: skip-file
+
+if sys.version_info[0] == 2:
+    def compat_ip_address(address):
+        """Intended for internal use only."""
+        if isinstance(address, bytes):
+            address = address.decode()
+        return ipaddress.ip_address(address)
+else:
+    def compat_ip_address(address):
+        """Intended for internal use only."""
+        return ipaddress.ip_address(address)

geoip2/webservice.py

@@ -25,27 +25,19 @@
 
 """
 
-import sys
-
 import requests
 
+from requests.utils import default_user_agent
+
 import geoip2
 import geoip2.models
 
-from requests.utils import default_user_agent
+from .compat import compat_ip_address
 
 from .errors import (AddressNotFoundError, AuthenticationError, GeoIP2Error,
                      HTTPError, InvalidRequestError, OutOfQueriesError,
                      PermissionRequiredError)
 
-if sys.version_info[0] == 2 or (sys.version_info[0] == 3 and
-                                sys.version_info[1] < 3):
-    import ipaddr as ipaddress  # pylint:disable=F0401
-
-    ipaddress.ip_address = ipaddress.IPAddress
-else:
-    import ipaddress  # pylint:disable=F0401
-
 
 class Client(object):
     """Creates a new client object.
@@ -96,6 +88,7 @@ def __init__(self,
                  host='geoip.maxmind.com',
                  locales=None,
                  timeout=None):
+        """Construct a Client."""
         # pylint: disable=too-many-arguments
         if locales is None:
             locales = ['en']
@@ -144,7 +137,7 @@ def insights(self, ip_address='me'):
 
     def _response_for(self, path, model_class, ip_address):
         if ip_address != 'me':
-            ip_address = str(ipaddress.ip_address(ip_address))
+            ip_address = str(compat_ip_address(ip_address))
         uri = '/'.join([self._base_uri, path, ip_address])
         response = requests.get(uri,
                                 auth=(self._user_id, self._license_key),

setup.py

@@ -33,7 +33,7 @@
     include_package_data=True,
     install_requires=requirements,
     extras_require={
-        ':python_version=="2.6" or python_version=="2.7"': ['ipaddr']},
+        ':python_version=="2.6" or python_version=="2.7"': ['ipaddress']},
     tests_require=['requests_mock'],
     test_suite="tests",
     license=geoip2.__license__,