Throw InvalidURL not UnicodeError on bad label.

diff --git a/requests/models.py b/requests/models.py
index 136427f..ae3c1be 100644 (file)
--- a/requests/models.py
+++ b/requests/models.py
@@ -413,7 +413,10 @@ class Request(object):
         if not scheme in SCHEMAS:
             raise InvalidSchema("Invalid scheme %r" % scheme)
 
-        netloc = netloc.encode('idna').decode('utf-8')
+        try:
+            netloc = netloc.encode('idna').decode('utf-8')
+        except UnicodeError:
+            raise InvalidURL('URL has an invalid label.')
 
         if not path:
             path = '/'