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

self.config.get('trust_env')

Browse Source 
just for @mitsuhiko
This commit is contained in:
Kenneth Reitz
2012-03-09 07:58:00 -08:00
parent e15ae8f9a7
commit 77e5443f71
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
requests/models.py
+4 -4
View File
@@ -104,7 +104,7 @@ class Request(object):
# If no proxies are given, allow configuration by environment variables
# HTTP_PROXY and HTTPS_PROXY.
if not self.proxies:
if not self.proxies and self.config.get('trust_env'):
if 'HTTP_PROXY' in os.environ:
self.proxies['http'] = os.environ['HTTP_PROXY']
if 'HTTPS_PROXY' in os.environ:
@@ -446,7 +446,7 @@ class Request(object):
self.headers['Content-Type'] = content_type
# Use .netrc auth if none was provided.
if not self.auth:
if not self.auth and self.config.get('trust_env'):
self.auth = get_netrc_auth(url)
if self.auth:
@@ -487,11 +487,11 @@ class Request(object):
cert_loc = self.verify
# Look for configuration.
if not cert_loc:
if not cert_loc and self.config.get('trust_env'):
cert_loc = os.environ.get('REQUESTS_CA_BUNDLE')
# Curl compatiblity.
if not cert_loc:
if not cert_loc and self.config.get('trust_env'):
cert_loc = os.environ.get('CURL_CA_BUNDLE')
# Use the awesome certifi list.