TypeError, not AttributeError on 3.3.

diff --git a/requests/utils.py b/requests/utils.py
index 168ff02e048399572012b8a0f1e369d8955eeff4..13b649d3bea606f905082c0d74bd72c2864dc600 100644 (file)
--- 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 ('', '')