projects
/
services
/
python-requests.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
dae4026
)
Don't repopulate proxies if we don't trust the env.
author
Cory Benfield
<lukasaoz@gmail.com>
Sat, 26 Apr 2014 12:05:01 +0000
(13:05 +0100)
committer
Cory Benfield
<lukasaoz@gmail.com>
Sat, 26 Apr 2014 12:05:01 +0000
(13:05 +0100)
requests/sessions.py
patch
|
blob
|
history
diff --git
a/requests/sessions.py
b/requests/sessions.py
index 28b5da9b9086aa19c5bdf122dc4dbdfd0ab33632..6b21b5df646583d01f0ce8fdb79ce4c32a48409e 100644
(file)
--- a/
requests/sessions.py
+++ b/
requests/sessions.py
@@
-218,11
+218,11
@@
class SessionRedirectMixin(object):
"""
headers = prepared_request.headers
url = prepared_request.url
- new_proxies = {}
+ scheme = urlparse(url).scheme
+ new_proxies = proxies.copy() if proxies is not None else {}
- if not should_bypass_proxies(url):
+ if
self.trust_env and
not should_bypass_proxies(url):
environ_proxies = get_environ_proxies(url)
- scheme = urlparse(url).scheme
proxy = environ_proxies.get(scheme)