Merge branch 'dev'

Author: Josh Watts

instagram/oauth2.py

@@ -2,6 +2,7 @@
 from six.moves.urllib.parse import urlencode
 from httplib2 import Http
 import mimetypes
+import six
 
 
 class OAuth2AuthExchangeError(Exception):
@@ -208,5 +209,8 @@ def make_request(self, url, method="GET", body=None, headers=None):
         headers = headers or {}
         if not 'User-Agent' in headers:
             headers.update({"User-Agent": "%s Python Client" % self.api.api_name})
+        # https://github.com/jcgregorio/httplib2/issues/173
+        # bug in httplib2 w/ Python 3 and disable_ssl_certificate_validation=True
+        http_obj = Http() if six.PY3 else Http(disable_ssl_certificate_validation=True)        
         http_obj = Http(disable_ssl_certificate_validation=True)
         return http_obj.request(url, method, body=body, headers=headers)