[feature/use_hex_encoding]

mocket/socket.py

@@ -12,7 +12,7 @@
 from datetime import datetime, timedelta
 from json.decoder import JSONDecodeError
 
-from mocket.compat import decode_from_bytes, encode_to_bytes
+from mocket.compat import decode_from_bytes, encode_to_bytes, ENCODING
 from mocket.inject import (
     true_gethostbyname,
     true_socket,
@@ -23,7 +23,6 @@
 from mocket.mode import MocketMode
 from mocket.utils import hexdump, hexload
 
-
 logger = logging.getLogger(__name__)
 xxh32 = None
 try:
@@ -275,8 +274,8 @@ def true_sendall(self, data, *args, **kwargs):
             else:
                 headers, body = response.split("\r\n\r\n", 1)
 
-                headers_bytes = headers.encode("utf-8")
-                body_bytes = body.encode("utf-8")
+                headers_bytes = headers.encode(ENCODING)
+                body_bytes = body.encode(ENCODING)
 
                 if "content-encoding: gzip" in headers.lower():
                     body_bytes = gzip.compress(body_bytes)
@@ -316,18 +315,14 @@ def true_sendall(self, data, *args, **kwargs):
                 if Mocket.get_use_hex_encoding():
                     response_dict["response"] = hexdump(encoded_response)
                 else:
-                    try:
-                        headers, body = encoded_response.split(b"\r\n\r\n", 1)
-
-                        if b"content-encoding: gzip" in headers.lower():
-                            body = gzip.decompress(body)
+                    headers, body = encoded_response.split(b"\r\n\r\n", 1)
 
-                        response_dict["response"] = (
-                            headers + b"\r\n\r\n" + body
-                        ).decode("utf-8")
+                    if b"content-encoding: gzip" in headers.lower():
+                        body = gzip.decompress(body)
 
-                    except UnicodeDecodeError as e:
-                        logger.warning("Mocket: Response not recorded: %s", e)
+                    response_dict["response"] = (headers + b"\r\n\r\n" + body).decode(
+                        ENCODING
+                    )
 
                 with open(path, mode="w") as f:
                     f.write(