Account for mediocre formdata implementation in curl_cffi (fix #825)

Author: dolfies

discord/client.py

@@ -319,6 +319,7 @@ def __init__(self, **options: Any) -> None:
             'captcha_handler', None
         )
         self.http: HTTPClient = HTTPClient(
+            loop=self.loop,
             proxy=proxy,
             proxy_auth=proxy_auth,
             unsync_clock=unsync_clock,
@@ -853,6 +854,7 @@ async def _async_setup_hook(self) -> None:
         loop = asyncio.get_running_loop()
         self.loop = loop
         self._connection.loop = loop
+        self.http.loop = loop
         await self._connection.async_setup()
 
         self._ready = asyncio.Event()

discord/http.py

@@ -26,6 +26,7 @@
 
 import asyncio
 import datetime
+import io
 import logging
 import re
 import ssl
@@ -591,6 +592,7 @@ def __init__(
         self,
         connector: Optional[aiohttp.BaseConnector] = None,
         *,
+        loop: asyncio.AbstractEventLoop,
         proxy: Optional[str] = None,
         proxy_auth: Optional[aiohttp.BasicAuth] = None,
         unsync_clock: bool = True,
@@ -602,6 +604,7 @@ def __init__(
         rpc_proxy: Optional[str] = None,
     ) -> None:
         self.connector: aiohttp.BaseConnector = connector or MISSING
+        self.loop: asyncio.AbstractEventLoop = loop
         self.__asession: aiohttp.ClientSession = MISSING
         self.__session: requests.AsyncSession[requests.Response] = MISSING
         # Route key -> Bucket hash
@@ -722,6 +725,20 @@ def get_ratelimit(self, key: str) -> Ratelimit:
             self._try_clear_expired_ratelimits()
         return value
 
+    def _parse_form_data(self, form: List[Dict[str, Any]]) -> asyncio.Future[CurlMime]:
+        def _inner_parse():
+            mime = CurlMime()
+            for part in form:
+                _data = part['data'].read() if isinstance(part['data'], io.IOBase) else part['data']
+                mime.addpart(
+                    part['name'],
+                    data=_data,
+                    filename=part.get('filename'),
+                    content_type=part.get('content_type'),
+                )
+            return mime
+        return self.loop.run_in_executor(None, _inner_parse)
+
     async def request(
         self,
         route: Route,
@@ -829,7 +846,7 @@ async def request(
                         f.reset(seek=tries)
 
                 if form:
-                    kwargs['multipart'] = CurlMime.from_list(form)
+                    kwargs['multipart'] = await self._parse_form_data(form)
 
                 if self.tracer:
                     trace_id = self.tracer.generate(self.user_id or 0)