From: Cory Benfield <lukasaoz@gmail.com>
Date: Sun, 12 Jan 2014 09:39:32 +0000 (+0000)
Subject: Meet @sigmavirus24's demanding stylistic criteria.
X-Git-Tag: v2.2.1~6^2~1^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b4ca6c95b60230ad604f8b89440fef18cfaa3a8c;p=services%2Fpython-requests.git

Meet @sigmavirus24's demanding stylistic criteria.
---

diff --git a/requests/utils.py b/requests/utils.py
index 13b649d..528e7c9 100644
--- a/requests/utils.py
+++ b/requests/utils.py
@@ -638,11 +638,13 @@ def get_auth_from_url(url):
         parsed = urlparse(url)
 
         try:
-            return (unquote(parsed.username), unquote(parsed.password))
+            auth = (unquote(parsed.username), unquote(parsed.password))
         except (AttributeError, TypeError):
-            pass
+            auth = ('', '')
+    else:
+        auth = ('', '')
 
-    return ('', '')
+    return auth
 
 
 def to_native_string(string, encoding='ascii'):