Merge pull request #59 from jkeyes/verify-certs

jkeyes · jkeyes · commit e530bc7b78e3 · 2015-03-20T16:17:29.000Z
Using certifi to supply root CA bundle.
diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -4,4 +4,3 @@
 https://github.com/jeffh/describe/tarball/dev#egg=describe-dev
 httpretty==0.8.8
 mock==1.0.1
-certifi==14.05.14
diff --git a/intercom/request.py b/intercom/request.py
@@ -2,6 +2,7 @@
 
 from . import errors
 
+import certifi
 import json
 import requests
 
@@ -27,10 +28,9 @@ def send_request_to_path(cls, method, url, auth, params=None):
         elif method == 'GET':
             req_params['params'] = params
         req_params['headers'] = headers
-
         resp = requests.request(
             method, url, timeout=cls.timeout,
-            auth=auth, **req_params)
+            auth=auth, verify=certifi.where(), **req_params)
 
         cls.raise_errors_on_failure(resp)
 
diff --git a/requirements.txt b/requirements.txt
@@ -1,6 +1,7 @@
 #
 # Runtime dependencies.
 #
+certifi
 inflection==0.3.0
 requests==2.6.0
 urllib3==1.10.2
diff --git a/setup.py b/setup.py
@@ -28,6 +28,6 @@
     classifiers=[],
     packages=find_packages(),
     include_package_data=True,
-    install_requires=["requests", "inflection"],
+    install_requires=["requests", "inflection", "certifi"],
     zip_safe=False
 )

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,6 @@`
`28`	`28`	`classifiers=[],`
`29`	`29`	`packages=find_packages(),`
`30`	`30`	`include_package_data=True,`
`31`		`- install_requires=["requests", "inflection"],`
	`31`	`+ install_requires=["requests", "inflection", "certifi"],`
`32`	`32`	`zip_safe=False`
`33`	`33`	`)`