From 12bedeea13ee61d6ef1f144278294fb06d4dd455 Mon Sep 17 00:00:00 2001 From: John Keyes Date: Fri, 20 Mar 2015 15:53:05 +0000 Subject: [PATCH] Using certifi to supply root CA bundle. --- dev-requirements.txt | 1 - intercom/request.py | 4 ++-- requirements.txt | 1 + setup.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 33097c29..216b3b8b 100644 --- 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 index d76ffce8..632fc108 100644 --- 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 index 9f5664fa..29a8f068 100644 --- 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 \ No newline at end of file diff --git a/setup.py b/setup.py index 4f67689b..c7a06eb9 100644 --- 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 )