From: Kenneth Reitz <me@kennethreitz.com>
Date: Fri, 22 Mar 2013 04:12:58 +0000 (-0400)
Subject: simplify get_auth_from_url call
X-Git-Tag: v1.2.0~16
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=132540956051e9486ffb3adcee95b47a71a37c80;p=services%2Fpython-requests.git

simplify get_auth_from_url call
---

diff --git a/requests/models.py b/requests/models.py
index d83562a..dd17e82 100644
--- a/requests/models.py
+++ b/requests/models.py
@@ -222,11 +222,10 @@ class Request(RequestHooksMixin):
         p.prepare_body(self.data, self.files)
         # Note that prepare_auth must be last to enable authentication schemes
         # such as OAuth to work on a fully prepared request.
-        if self.auth is None:
-            auth = get_auth_from_url(self.url)
-            if auth[0] is not None and auth[1] is not None:
-                self.auth = auth
-        p.prepare_auth(self.auth)
+
+        embedded_auth = get_auth_from_url(self.url)
+        p.prepare_auth(self.auth or embedded_auth)
+
         # This MUST go after prepare_auth. Authenticators could add a hook
         p.prepare_hooks(self.hooks)