From da89fbc8b5b6f0cb994d8575c04d4219b38c13a6 Mon Sep 17 00:00:00 2001 From: Michael H Date: Wed, 28 Aug 2024 15:23:51 -0400 Subject: [PATCH] Re-add client connector param This provides paths for users to handle two entirely seperate issues - Alternative fix for #9870 - Allows handling of windows sslcontext issues without a global truststore.inject_into_ssl() use --- discord/client.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/discord/client.py b/discord/client.py index a91be7160..4f5dfe9f0 100644 --- a/discord/client.py +++ b/discord/client.py @@ -249,6 +249,11 @@ class Client: set to is ``30.0`` seconds. .. versionadded:: 2.0 + connector: Optional[:class:`aiohttp.BaseConnector`] + The aiohhtp connector to use for this client. This can be used to control underlying aiohttp + behavior, such as setting a dns resolver or sslcontext. + + .. versionadded:: 2.5 Attributes ----------- @@ -264,6 +269,7 @@ class Client: self.shard_id: Optional[int] = options.get('shard_id') self.shard_count: Optional[int] = options.get('shard_count') + connector: Optional[aiohttp.BaseConnector] = options.get('connector', None) proxy: Optional[str] = options.pop('proxy', None) proxy_auth: Optional[aiohttp.BasicAuth] = options.pop('proxy_auth', None) unsync_clock: bool = options.pop('assume_unsync_clock', True) @@ -271,6 +277,7 @@ class Client: max_ratelimit_timeout: Optional[float] = options.pop('max_ratelimit_timeout', None) self.http: HTTPClient = HTTPClient( self.loop, + connector, proxy=proxy, proxy_auth=proxy_auth, unsync_clock=unsync_clock,