Merge pull request #138 from twm/idn-fo-realz

Handle Internationalized Domain Names

setup.py

@@ -29,14 +29,13 @@
 install_requires = [
     "requests >= 2.1.0",
     "service_identity >= 14.0.0",
-    "six"
+    "six",
+    "Twisted >= 16.0.0",
 ]
 
 if PY3:
-    install_requires.append("Twisted >= 16.0.0")
     install_requires.append("pyOpenSSL >= 0.15.1")
 else:
-    install_requires.append("Twisted >= 16.0.0")
     install_requires.append("pyOpenSSL >= 0.13")
 
 setup(

treq/client.py

@@ -10,6 +10,7 @@
 from twisted.python.components import proxyForInterface
 from twisted.python.compat import _PY3, unicode
 from twisted.python.filepath import FilePath
+from twisted.python.url import URL
 
 from twisted.web.http import urlparse
 
@@ -132,7 +133,7 @@ def request(self, method, url, **kwargs):
             url = _combine_query_params(url, params)
 
         if isinstance(url, unicode):
-            url = url.encode('ascii')
+            url = URL.fromText(url).asURI().asText().encode('ascii')
 
         # Convert headers dictionary to
         # twisted raw headers format.

treq/test/test_client.py

@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 from io import BytesIO
 
 import mock
@@ -34,6 +35,12 @@ def assertBody(self, expected):
         body = self.FileBodyProducer.mock_calls[0][1][0]
         self.assertEqual(body.read(), expected)
 
+    def test_request_uri_idn(self):
+        self.client.request('GET', u'http://‽.net')
+        self.agent.request.assert_called_once_with(
+            b'GET', b'http://xn--fwg.net',
+            Headers({b'accept-encoding': [b'gzip']}), None)
+
     def test_request_case_insensitive_methods(self):
         self.client.request('gEt', 'http://example.com/')
         self.agent.request.assert_called_once_with(