Move compression out of adapter

httpie/client.py

@@ -56,7 +56,6 @@ def collect_messages(
     send_kwargs_mergeable_from_env = make_send_kwargs_mergeable_from_env(args)
     requests_session = build_requests_session(
         ssl_version=args.ssl_version,
-        compress_arg=args.compress,
     )
 
     if httpie_session:
@@ -78,6 +77,8 @@ def collect_messages(
 
     request = requests.Request(**request_kwargs)
     prepared_request = requests_session.prepare_request(request)
+    if args.compress and prepared_request.body:
+        compress_body(prepared_request, always=args.compress > 1)
     response_count = 0
     while prepared_request:
         yield prepared_request
@@ -122,31 +123,7 @@ def max_headers(limit):
         http.client._MAXHEADERS = orig
 
 
-class HTTPieHTTPAdapter(HTTPAdapter):
-
-    def __init__(
-        self,
-        ssl_version=None,
-        compression_enabled=False,
-        compress_always=False,
-        **kwargs,
-    ):
-        self._ssl_version = ssl_version
-        self._compression_enabled = compression_enabled
-        self._compress_always = compress_always
-        super().__init__(**kwargs)
-
-    def init_poolmanager(self, *args, **kwargs):
-        kwargs['ssl_version'] = self._ssl_version
-        super().init_poolmanager(*args, **kwargs)
-
-    def send(self, request: requests.PreparedRequest, **kwargs):
-        if request.body and self._compression_enabled:
-            self._compress_body(request, always=self._compress_always)
-        return super().send(request, **kwargs)
-
-    @staticmethod
-    def _compress_body(request: requests.PreparedRequest, always: bool):
+def compress_body(request: requests.PreparedRequest, always: bool):
     deflater = zlib.compressobj()
     body_bytes = (
         request.body
@@ -162,20 +139,29 @@ class HTTPieHTTPAdapter(HTTPAdapter):
         request.headers['Content-Length'] = str(len(deflated_data))
 
 
+class HTTPieHTTPSAdapter(HTTPAdapter):
+
+    def __init__(self, ssl_version=None, **kwargs):
+        self._ssl_version = ssl_version
+        super().__init__(**kwargs)
+
+    def init_poolmanager(self, *args, **kwargs):
+        kwargs['ssl_version'] = self._ssl_version
+        super().init_poolmanager(*args, **kwargs)
+
+
 def build_requests_session(
-    compress_arg: int,
     ssl_version: str = None,
 ) -> requests.Session:
     requests_session = requests.Session()
 
     # Install our adapter.
-    adapter = HTTPieHTTPAdapter(
-        ssl_version=SSL_VERSION_ARG_MAPPING[ssl_version] if ssl_version else None,
-        compression_enabled=compress_arg > 0,
-        compress_always=compress_arg > 1,
+    requests_session.mount('https://', HTTPieHTTPSAdapter(
+        ssl_version=(
+            SSL_VERSION_ARG_MAPPING[ssl_version]
+            if ssl_version else None
         )
-    requests_session.mount('http://', adapter)
-    requests_session.mount('https://', adapter)
+    ))
 
     # Install adapters from plugins.
     for plugin_cls in plugin_manager.get_transport_plugins():