Validate IP addresses with the ipaddress module (ipaddr for Python 2.x)

Author: oschwald

.travis.yml

@@ -1,20 +1,26 @@
 language: python
+
 python:
   - 2.6
   - 2.7
   - 3.2
   - 3.3
   - pypy
+
 install:
   - pip install -r requirements.txt
   - pip install git+https://github.com/maxmind/HTTPretty.git
   - pip install pylint coveralls
-  - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install unittest2; fi
+  - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install unittest2 ipaddr; fi
+  - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then pip install ipaddr; fi
+
 script:
   - coverage run --source=geoip2 setup.py test
   - if [[ $TRAVIS_PYTHON_VERSION != '3.3' ]]; then pylint geoip2; fi
+
 after_success:
   - coveralls
+
 notifications:
   email:
     recipients:

geoip2/webservices.py

@@ -100,6 +100,13 @@
 from requests.utils import default_user_agent
 from .errors import GeoIP2Error, HTTPError, WebServiceError
 
+import sys
+
+if sys.version_info[0] == 2:
+    import ipaddr as ipaddress
+    ipaddress.ip_address = ipaddress.IPAddress
+else:
+    import ipaddress
 
 class Client(object):
     """This method creates a new client object.
@@ -204,6 +211,8 @@ def omni(self, ip_address='me'):
         return self._response_for('omni', geoip2.models.Omni, ip_address)
 
     def _response_for(self, path, model_class, ip_address):
+        if ip_address != 'me':
+            ip_address = str(ipaddress.ip_address(ip_address))
         uri = '/'.join([self._base_uri, path, ip_address])
         response = requests.get(uri, auth=(self.user_id, self.license_key),
                                 headers={'Accept': 'application/json',

requirements.txt

@@ -1 +1 @@
-requests
+requests>=1.0

setup.py

@@ -16,6 +16,10 @@
 
 packages = ['geoip2']
 
+requirements = [i.strip() for i in open("requirements.txt").readlines()]
+
+if sys.version_info[0] == 2:
+    requirements.append('ipaddr')
 
 setup(
     name='geoip2',
@@ -30,7 +34,7 @@
     package_data={'': ['LICENSE'] },
     package_dir={'geoip2': 'geoip2'},
     include_package_data=True,
-    install_requires=['requests'],
+    install_requires=requirements,
     test_suite="tests",
     license=open('LICENSE').read(),
     classifiers=(

tests/webservices_test.py

@@ -104,28 +104,10 @@ def test_200_error(self):
             self.client.country('1.1.1.1')
 
     def test_400_error(self):
-        body = {'code': 'IP_ADDRESS_INVALID',
-                'error': 'The value "1.2.3" is not a '
-                'valid ip address',}
-        httpretty.register_uri(httpretty.GET,
-                               self.base_uri + 'country/1.2.3',
-                               body = json.dumps(body),
-                               status = 400,
-                               content_type = self._content_type('country'))
-        with self.assertRaisesRegex(WebServiceError,
-                                     'The value "1.2.3" is not a valid '
-                                    'ip address'):
-            self.client.country('1.2.3')
-        # XXX - there might be a better way to do this
-        try:
+        with self.assertRaisesRegex(ValueError,
+                                    "'1.2.3' does not appear to be an IPv4 "
+                                    "or IPv6 address"):
             self.client.country('1.2.3')
-        except WebServiceError as e:
-            self.assertEqual(e.http_status, 400,
-                             'exception object contains expected http_status'
-                             )
-            self.assertEqual(e.code,'IP_ADDRESS_INVALID',
-                             'exception object contains expected code'
-                             )
 
     def test_no_body_error(self):
         httpretty.register_uri(httpretty.GET,