From 42ec8b08f2446d0d69cb0c71816f6105dddc814d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastien=20G=C3=A9rard?= Date: Sun, 19 Mar 2017 23:04:41 +0100 Subject: [PATCH] #3927 fixes based on review --- requests/adapters.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/requests/adapters.py b/requests/adapters.py index 03aa3b03..9568d3d0 100644 --- a/requests/adapters.py +++ b/requests/adapters.py @@ -223,10 +223,10 @@ class HTTPAdapter(BaseAdapter): conn.cert_reqs = 'CERT_REQUIRED' - if os.path.isdir(cert_loc): - conn.ca_cert_dir = cert_loc - else: + if not os.path.isdir(cert_loc): conn.ca_certs = cert_loc + else: + conn.ca_cert_dir = cert_loc else: conn.cert_reqs = 'CERT_NONE' conn.ca_certs = None @@ -234,7 +234,8 @@ class HTTPAdapter(BaseAdapter): if cert: if not isinstance(cert, basestring): - conn.cert_file, conn.key_file = cert + conn.cert_file = cert[0] + conn.key_file = cert[1] else: conn.cert_file = cert if conn.cert_file and not os.path.exists(conn.cert_file):