Merge branch 'master' of github.com:KeepSafe/aiohttp

aiohttp/client_reqrep.py

@@ -568,8 +568,17 @@ def __del__(self, _warnings=warnings):
 
     def __repr__(self):
         out = io.StringIO()
+        ascii_encodable_url = self.url.encode('ascii', 'backslashreplace') \
+            .decode('ascii')
+        if self.reason:
+            ascii_encodable_reason = self.reason.encode('ascii',
+                                                        'backslashreplace') \
+                .decode('ascii')
+        else:
+            ascii_encodable_reason = self.reason
         print('<ClientResponse({}) [{} {}]>'.format(
-            self.url, self.status, self.reason), file=out)
+            ascii_encodable_url, self.status, ascii_encodable_reason),
+            file=out)
         print(self.headers, file=out)
         return out.getvalue()
 

aiohttp/web_reqrep.py

@@ -399,8 +399,10 @@ def copy(self):
         raise NotImplementedError
 
     def __repr__(self):
+        ascii_encodable_path = self.path.encode('ascii', 'backslashreplace') \
+            .decode('ascii')
         return "<{} {} {} >".format(self.__class__.__name__,
-                                    self.method, self.path)
+                                    self.method, ascii_encodable_path)
 
 
 ############################################################

tests/test_client_response.py

@@ -70,6 +70,21 @@ def test_repr(self):
             '<ClientResponse(http://def-cl-resp.org) [200 Ok]>',
             repr(self.response))
 
+    def test_repr_non_ascii_url(self):
+        response = ClientResponse('get', 'http://fake-host.org/\u03bb')
+        self.assertIn(
+            "<ClientResponse(http://fake-host.org/\\u03bb) [None None]>",
+            repr(response))
+        response.close()
+
+    def test_repr_non_ascii_reason(self):
+        response = ClientResponse('get', 'http://fake-host.org/path')
+        response.reason = '\u03bb'
+        self.assertIn(
+            "<ClientResponse(http://fake-host.org/path) [None \\u03bb]>",
+            repr(response))
+        response.close()
+
     def test_read_and_release_connection(self):
         def side_effect(*args, **kwargs):
             fut = helpers.create_future(self.loop)

tests/test_web_request.py

@@ -218,6 +218,11 @@ def test___repr__(make_request):
     assert "<Request GET /path/to >" == repr(req)
 
 
+def test___repr___non_ascii_path(make_request):
+    req = make_request('GET', '/path/\U0001f415\U0001f308')
+    assert "<Request GET /path/\\U0001f415\\U0001f308 >" == repr(req)
+
+
 def test_http_scheme(make_request):
     req = make_request('GET', '/')
     assert "http" == req.scheme