diff options
| author | Cory Benfield <lukasaoz@gmail.com> | 2014-04-26 13:05:01 +0100 |
|---|---|---|
| committer | Cory Benfield <lukasaoz@gmail.com> | 2014-04-26 13:05:01 +0100 |
| commit | 459f8dfccb7ee2e1dc9e041b7aebc2392219c35e (patch) | |
| tree | b05805700e597962312d80f6a5420e2cb780cf2d /requests/sessions.py | |
| parent | dae4026c18b29b5995d41c1e50741a3d34f1297e (diff) | |
| download | python-requests-459f8dfccb7ee2e1dc9e041b7aebc2392219c35e.tar.gz | |
Don't repopulate proxies if we don't trust the env.
Diffstat (limited to 'requests/sessions.py')
| -rw-r--r-- | requests/sessions.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/requests/sessions.py b/requests/sessions.py index 28b5da9b..6b21b5df 100644 --- 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) |