From 2a059a9f19c7b37c6c71c233754c6845e325d1ec Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Tue, 21 May 2024 18:44:08 +0200 Subject: [PATCH] Extend fix to requests 2.32.2+. Signed-off-by: Felix Fontein --- docker/transport/basehttpadapter.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/docker/transport/basehttpadapter.py b/docker/transport/basehttpadapter.py index 281897a2..c5996bb3 100644 --- a/docker/transport/basehttpadapter.py +++ b/docker/transport/basehttpadapter.py @@ -7,9 +7,14 @@ class BaseHTTPAdapter(requests.adapters.HTTPAdapter): if hasattr(self, 'pools'): self.pools.clear() - # Hotfix for requests 2.32.0: its commit + # Hotfix for requests 2.32.0 and 2.32.1: its commit # https://github.com/psf/requests/commit/c0813a2d910ea6b4f8438b91d315b8d181302356 # changes requests.adapters.HTTPAdapter to no longer call get_connection() from # send(), but instead call _get_connection(). def _get_connection(self, request, *args, proxies=None, **kwargs): return self.get_connection(request.url, proxies) + + # Fix for requests 2.32.2+: + # https://github.com/psf/requests/commit/c98e4d133ef29c46a9b68cd783087218a8075e05 + def get_connection_with_tls_context(self, request, verify, proxies=None, cert=None): + return self.get_connection(request.url, proxies)