From dddb41e34906c1b7eff389921c7b1bb6d734a433 Mon Sep 17 00:00:00 2001
From: Cory Benfield <lukasaoz@gmail.com>
Date: Sat, 11 Jan 2014 10:15:53 +0000
Subject: [PATCH] TypeError, not AttributeError on 3.3.

---
 requests/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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