Merged with the default branch.1.10.0-1

1 files changed, 10 insertions, 2 deletions

diff --git a/test/unit/http.py b/test/unit/http.py
index 1ce86e5a..c0af8a9e 100644
--- a/test/unit/http.py
+++ b/test/unit/http.py
@@ -81,7 +81,11 @@ class TestHTTP(TestUnit):
         sock.sendall(req)
 
         if TestUnit.detailed:
-            print('>>>', req, sep='\n')
+            print('>>>')
+            try:
+                print(req.decode('utf-8', 'ignore'))
+            except UnicodeEncodeError:
+                print(req)
 
         resp = ''
 
@@ -93,7 +97,11 @@ class TestHTTP(TestUnit):
             resp = self.recvall(sock, read_timeout=read_timeout).decode(enc)
 
         if TestUnit.detailed:
-            print('<<<', resp.encode('utf-8'), sep='\n')
+            print('<<<')
+            try:
+                print(resp)
+            except UnicodeEncodeError:
+                print(resp.encode())
 
         if 'raw_resp' not in kwargs:
             resp = self._resp_to_dict(resp)