Enable UTS46 mode.

itachi0746 · Oct 14, 2016 · 8dd51d2 · 8dd51d2
1 parent 110684e
commit 8dd51d2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/requests/models.py b/requests/models.py
@@ -364,7 +364,7 @@ def prepare_url(self, url, params):
 
         # Only want to apply IDNA to the hostname
         try:
-            host = idna.encode(host).decode('utf-8')
+            host = idna.encode(host, uts46=True).decode('utf-8')
         except (UnicodeError, idna.IDNAError):
             raise InvalidURL('URL has an invalid label.')
 

diff --git a/tests/test_requests.py b/tests/test_requests.py
@@ -1900,11 +1900,22 @@ class TestPreparingURLs(object):
                 u'http://ジェーピーニック.jp'.encode('utf-8'),
                 u'http://xn--hckqz9bzb1cyrb.jp/'
             ),
-            (u'http://straße.de/straße', u'http://xn--strae-oqa.de/stra%C3%9Fe'),
+            (
+                u'http://straße.de/straße',
+                u'http://xn--strae-oqa.de/stra%C3%9Fe'
+            ),
             (
                 u'http://straße.de/straße'.encode('utf-8'),
                 u'http://xn--strae-oqa.de/stra%C3%9Fe'
             ),
+            (
+                u'http://Königsgäßchen.de/straße',
+                u'http://xn--knigsgchen-b4a3dun.de/stra%C3%9Fe'
+            ),
+            (
+                u'http://Königsgäßchen.de/straße'.encode('utf-8'),
+                u'http://xn--knigsgchen-b4a3dun.de/stra%C3%9Fe'
+            ),
         )
     )
     def test_preparing_url(self, url, expected):