CURL_CA_BUNDLE

This commit is contained in:
Kenneth Reitz
2012-12-17 13:41:20 -05:00
parent 910b2312d6
commit 1e64fbcb55
2 changed files with 10 additions and 8 deletions
-8
View File
@@ -64,14 +64,6 @@ class HTTPAdapter(BaseAdapter):
if verify is not True:
cert_loc = verify
# Look for configuration.
if not cert_loc and self.config.get('trust_env'):
cert_loc = os.environ.get('REQUESTS_CA_BUNDLE')
# Curl compatibility.
if not cert_loc and self.config.get('trust_env'):
cert_loc = os.environ.get('CURL_CA_BUNDLE')
if not cert_loc:
cert_loc = DEFAULT_CA_BUNDLE_PATH
+10
View File
@@ -8,6 +8,7 @@ This module provides a Session object to manage and persist settings across
requests (cookies, auth, proxies).
"""
import os
from .compat import cookielib
from .cookies import cookiejar_from_dict
@@ -226,6 +227,15 @@ class Session(SessionRedirectMixin):
if not auth:
auth = get_netrc_auth(url)
# Look for configuration.
if not verify and verify is not False:
verify = os.environ.get('REQUESTS_CA_BUNDLE')
# Curl compatibility.
if not verify and verify is not False:
verify = os.environ.get('CURL_CA_BUNDLE')
# Merge all the kwargs.
params = merge_kwargs(params, self.params)
headers = merge_kwargs(headers, self.headers)