Contact Lists & Contacts module

.gitignore

@@ -5,3 +5,5 @@
 dist
 /build
 MANIFEST
+.idea
+.DS_Store

hapi/base.py

@@ -1,15 +1,18 @@
-import urllib
-import httplib
+from __future__ import print_function
+from builtins import object
+from past.builtins import basestring
+from future.moves.urllib.parse import urlencode
+import http.client
 import simplejson as json
-import utils
+from . import utils
 import logging
 import sys
 import time
 import traceback
 import gzip
-import StringIO
+import six
 
-from error import HapiError, HapiBadRequest, HapiNotFound, HapiTimeout, HapiServerError, HapiUnauthorized
+from .error import HapiError, HapiBadRequest, HapiNotFound, HapiTimeout, HapiServerError, HapiUnauthorized
 
 
 _PYTHON25 = sys.version_info < (2, 6)
@@ -45,7 +48,7 @@ def __init__(self, api_key=None, timeout=10, mixins=[], access_token=None, refre
         self._prepare_connection_type()
 
     def _prepare_connection_type(self):
-        connection_types = {'http': httplib.HTTPConnection, 'https': httplib.HTTPSConnection}
+        connection_types = {'http': http.client.HTTPConnection, 'https': http.client.HTTPSConnection}
         parts = self.options['api_base'].split('://')
         protocol = (parts[0:-1]+['https'])[0]
         self.options['connection_type'] = connection_types[protocol]
@@ -56,6 +59,7 @@ def _get_path(self, subpath):
         raise Exception("Unimplemented get_path for BaseClient subclass!")
 
     def _prepare_request_auth(self, subpath, params, data, opts):
+        headers = opts.get('headers', {}) if opts else {}
         if self.api_key:
             params['hapikey'] = params.get('hapikey') or self.api_key
         else:
@@ -64,11 +68,12 @@ def _prepare_request_auth(self, subpath, params, data, opts):
             # but one was provided as part of the method invocation, we persist it
             if params.get('access_token') and not self.access_token:
                 self.access_token = params.get('access_token')
-            params['access_token'] = self.access_token
+            headers.update({"Authorization": "Bearer %s" % self.access_token})
+        return headers
 
     def _prepare_request(self, subpath, params, data, opts, doseq=False, query=''):
         params = params or {}
-        self._prepare_request_auth(subpath, params, data, opts)
+        headers = self._prepare_request_auth(subpath, params, data, opts)
 
         if opts.get('hub_id') or opts.get('portal_id'):
             params['portalId'] = opts.get('hub_id') or opts.get('portal_id')
@@ -78,8 +83,7 @@ def _prepare_request(self, subpath, params, data, opts, doseq=False, query=''):
             query = query[1:]
         if query and not query.startswith('&'):
             query = '&' + query
-        url = opts.get('url') or '/%s?%s%s' % (self._get_path(subpath), urllib.urlencode(params, doseq), query)
-        headers = opts.get('headers') or {}
+        url = opts.get('url') or '/%s?%s%s' % (self._get_path(subpath), urlencode(params, doseq), query)
         headers.update({
             'Accept-Encoding': 'gzip',
             'Content-Type': opts.get('content_type') or 'application/json'})
@@ -97,7 +101,7 @@ def _create_request(self, conn, method, url, headers, data):
         return params
 
     def _gunzip_body(self, body):
-        sio = StringIO.StringIO(body)
+        sio = six.BytesIO(body)
         gf = gzip.GzipFile(fileobj=sio, mode="rb")
         return gf.read()
 
@@ -112,7 +116,7 @@ def _execute_request_raw(self, conn, request):
         except:
             raise HapiTimeout(None, request, traceback.format_exc())
 
-        encoding = [i[1] for i in result.getheaders() if i[0] == 'content-encoding']
+        encoding = [i[1] for i in result.getheaders() if i[0].lower() == 'content-encoding']
         result.body = self._process_body(result.read(), len(encoding) and encoding[0] == 'gzip')
 
         conn.close()
@@ -137,7 +141,6 @@ def _digest_result(self, data):
                 data = json.loads(data)
             except ValueError:
                 pass
-
         return data
 
     def _call_raw(self, subpath, params=None, method='GET', data=None, doseq=False, query='', retried=False, **options):
@@ -167,7 +170,7 @@ def _call_raw(self, subpath, params=None, method='GET', data=None, doseq=False,
                 request_info = self._create_request(connection, method, url, headers, data)
                 result = self._execute_request_raw(connection, request_info)
                 break
-            except HapiUnauthorized, e:
+            except HapiUnauthorized as e:
                 self.log.warning("401 Unauthorized response to API request.")
                 if self.access_token and self.refresh_token and self.client_id and not retried:
                     self.log.info("Refreshing access token")
@@ -176,7 +179,7 @@ def _call_raw(self, subpath, params=None, method='GET', data=None, doseq=False,
                         decoded = json.loads(token_response)
                         self.access_token = decoded['access_token']
                         self.log.info('Retrying with new token %' % (self.access_token))
-                    except Exception, e:
+                    except Exception as e:
                         self.log.error("Unable to refresh access_token: %s" % (e))
                         raise
                     return self._call_raw(subpath, params=params, method=method, data=data, doseq=doseq, query=query, retried=True, **options)
@@ -188,7 +191,7 @@ def _call_raw(self, subpath, params=None, method='GET', data=None, doseq=False,
                     elif self.access_token and not self.client_id:
                         self.log.error("In order to enable automated refreshing of your access token, please provide a client_id in addition to a refresh token.")
                     raise
-            except HapiError, e:
+            except HapiError as e:
                 if try_count > num_retries:
                     logging.warning("Too many retries for %s", url)
                     raise