kennethreitz/requests
1
0
Fork 0
mirror of https://github.com/kennethreitz/requests.git synced 2026-06-05 22:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

#3927 fixes based on review

Browse Source
This commit is contained in:
Bastien Gérard
2017-03-19 23:04:41 +01:00
parent 7d8b87c37f
commit 42ec8b08f2
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
requests/adapters.py
+5 -4
View File
@@ -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):