From: Cory Benfield <lukasaoz@gmail.com>
Date: Sat, 11 Jan 2014 10:15:53 +0000 (+0000)
Subject: TypeError, not AttributeError on 3.3.
X-Git-Tag: v2.2.1~6^2~1^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dddb41e34906c1b7eff389921c7b1bb6d734a433;p=services%2Fpython-requests.git

TypeError, not AttributeError on 3.3.
---

diff --git a/requests/utils.py b/requests/utils.py
index 168ff02..13b649d 100644
--- a/requests/utils.py
+++ b/requests/utils.py
@@ -639,7 +639,7 @@ def get_auth_from_url(url):
 
         try:
             return (unquote(parsed.username), unquote(parsed.password))
-        except AttributeError:
+        except (AttributeError, TypeError):
             pass
 
     return ('', '')