Merge pull request maxmind#39 from maxmind/greg/fix-basic-auth

Fix basic auth issue with requests 2.12.2 and 2.12.3

Author: rafl

.travis.yml

@@ -6,6 +6,7 @@ python:
   - '3.3'
   - '3.4'
   - '3.5'
+  - '3.6-dev'
   - nightly
   - pypy
 matrix:

HISTORY.rst

@@ -3,6 +3,15 @@
 History
 -------
 
+2.4.2 (2016-12-08)
+++++++++++++++++++
+
+* Recent releases of ``requests`` (2.12.2 and 2.12.3) require that the
+  username for basic authentication be a string or bytes. The documentation
+  for this module uses an integer for the ``user_id``, which will break with
+  these ``requests`` versions. The ``user_id`` is now converted to bytes
+  before being passed to ``requests``.
+
 2.4.1 (2016-11-21)
 ++++++++++++++++++
 

geoip2/webservice.py

@@ -93,7 +93,9 @@ def __init__(self,
         if locales is None:
             locales = ['en']
         self._locales = locales
-        self._user_id = user_id
+        # requests 2.12.2 requires that the username passed to auth be bytes
+        # or a string, with the former being preferred.
+        self._user_id = str(user_id).encode()
         self._license_key = license_key
         self._base_uri = 'https://%s/geoip/v2.1' % host
         self._timeout = timeout
@@ -141,8 +143,10 @@ def _response_for(self, path, model_class, 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',
-                                         'User-Agent': self._user_agent()},
+                                headers={
+                                    'Accept': 'application/json',
+                                    'User-Agent': self._user_agent()
+                                },
                                 timeout=self._timeout)
         if response.status_code == 200:
             body = self._handle_success(response, uri)