From: Kenneth Reitz <me@kennethreitz.com>
Date: Fri, 31 Jan 2014 17:27:05 +0000 (-0500)
Subject: cleanup shitty code
X-Git-Tag: v2.3.0~32
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f74f5e3ebf0943163cd21b93fb682f790277aa19;p=services%2Fpython-requests.git

cleanup shitty code
---

diff --git a/requests/sessions.py b/requests/sessions.py
index ae7390c..de92d50 100644
--- a/requests/sessions.py
+++ b/requests/sessions.py
@@ -153,22 +153,20 @@ class SessionRedirectMixin(object):
             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)