diff options
| author | mlcrazy <liumatt@gmail.com> | 2017-06-06 17:27:25 -0400 |
|---|---|---|
| committer | mlcrazy <liumatt@gmail.com> | 2017-06-09 14:10:47 -0400 |
| commit | 1d7fd6c8b305351ba34280492fa3a9cf968cfbb8 (patch) | |
| tree | 5e01726d9b84f8563d4ed2bd47821828ef415c19 /requests/utils.py | |
| parent | b6ee4b2156989d25cc1e873593d2d853a935dc10 (diff) | |
| download | python-requests-1d7fd6c8b305351ba34280492fa3a9cf968cfbb8.tar.gz | |
Fixes error swallowing in set_environ
Diffstat (limited to 'requests/utils.py')
| -rw-r--r-- | requests/utils.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/requests/utils.py b/requests/utils.py index 25af9923..1e4960d7 100644 --- a/requests/utils.py +++ b/requests/utils.py @@ -612,18 +612,18 @@ def set_environ(env_name, value): the environment variable 'env_name'. If 'value' is None, do nothing""" - if value is not None: + value_changed = value is not None + if value_changed: old_value = os.environ.get(env_name) os.environ[env_name] = value try: yield finally: - if value is None: - return - if old_value is None: - del os.environ[env_name] - else: - os.environ[env_name] = old_value + if value_changed: + if old_value is None: + del os.environ[env_name] + else: + os.environ[env_name] = old_value def should_bypass_proxies(url, no_proxy): |
