diff options
| author | Kenneth Reitz <me@kennethreitz.org> | 2017-05-26 18:34:30 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-26 18:34:30 -0700 |
| commit | 4c3d307eb9b37cf2df43d10ab67a907ca7abc66a (patch) | |
| tree | 3ef8deb5eb9b2d70d571b7cfcad64b1c9ab38683 | |
| parent | 380d130245f3e19de3dfe2b9628d460a5fe31bce (diff) | |
| parent | a9470fe31f0c9590dafeac4b53f91fbf11fd6677 (diff) | |
| download | python-requests-4c3d307eb9b37cf2df43d10ab67a907ca7abc66a.tar.gz | |
Merge pull request #4052 from hile/master
Fix regression in API caused by commit 85400d8d6751071ef78f042d1efa72…
| -rw-r--r-- | requests/utils.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/requests/utils.py b/requests/utils.py index 08a97fa8..5976192f 100644 --- a/requests/utils.py +++ b/requests/utils.py @@ -684,7 +684,7 @@ def should_bypass_proxies(url, no_proxy): return False -def get_environ_proxies(url, no_proxy): +def get_environ_proxies(url, no_proxy=None): """ Return a dict of environment proxies. |