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

Update verify check and doc-string

Browse Source
This commit is contained in:
Ian Cordasco
2014-08-24 09:54:56 -05:00
parent b4a7906bca
commit 596ca83f0c
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
requests/sessions.py
+5 -7
View File
@@ -593,7 +593,7 @@ class Session(SessionRedirectMixin):
return r
def merge_environment_settings(self, url, proxies, stream, verify, cert):
"""Checks the environment and merges it with some settings."""
"""Check the environment and merge it with some settings."""
# Gather clues from the surrounding environment.
if self.trust_env:
# Set environment's proxies.
@@ -601,13 +601,11 @@ class Session(SessionRedirectMixin):
for (k, v) in env_proxies.items():
proxies.setdefault(k, v)
# Look for configuration.
# Look for requests environment configuration and be compatible
# with cURL.
if verify is True or verify is None:
verify = os.environ.get('REQUESTS_CA_BUNDLE')
# Curl compatibility.
if verify is True or verify is None:
verify = os.environ.get('CURL_CA_BUNDLE')
verify = (os.environ.get('REQUESTS_CA_BUNDLE') or
os.environ.get('CURL_CA_BUNDLE'))
# Merge all the kwargs.
proxies = merge_setting(proxies, self.proxies)