Permalink
Browse files

cleanup shitty code

  • Loading branch information...
kennethreitz committed Jan 31, 2014
1 parent f1893c8 commit f74f5e3ebf0943163cd21b93fb682f790277aa19
Showing with 9 additions and 11 deletions.
  1. +9 −11 requests/sessions.py
View
@@ -153,22 +153,20 @@ def resolve_redirects(self, resp, req, stream=False, timeout=None,
except KeyError:
pass
- extract_cookies_to_jar(prepared_request._cookies,
- prepared_request, resp.raw)
+ extract_cookies_to_jar(prepared_request._cookies, prepared_request, resp.raw)
prepared_request._cookies.update(self.cookies)
prepared_request.prepare_cookies(prepared_request._cookies)
- # If we get redirected to a new host, we should strip out any
- # authentication headers.
- original_parsed = urlparse(resp.request.url)
- redirect_parsed = urlparse(url)
+ if 'Authorization' in headers:
+ # If we get redirected to a new host, we should strip out any
+ # authentication headers.
+ original_parsed = urlparse(resp.request.url)
+ redirect_parsed = urlparse(url)
- if (original_parsed.hostname != redirect_parsed.hostname and
- 'Authorization' in headers):
- del headers['Authorization']
+ if (original_parsed.hostname != redirect_parsed.hostname):
+ del headers['Authorization']
- # However, .netrc might have more auth for us. Let's get it if it
- # does.
+ # .netrc might have more auth for us.
new_auth = get_netrc_auth(url) if self.trust_env else None
if new_auth is not None:
prepared_request.prepare_auth(new_auth)

0 comments on commit f74f5e3

Please sign in to comment.