From e33e0a437ecd895158c8cb4322a0cdad79312636 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Mon, 20 May 2024 21:13:41 +0200 Subject: [PATCH 1/3] Hotfix for requests 2.32.0. Signed-off-by: Felix Fontein --- docker/transport/basehttpadapter.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docker/transport/basehttpadapter.py b/docker/transport/basehttpadapter.py index dfbb193b9..281897a27 100644 --- a/docker/transport/basehttpadapter.py +++ b/docker/transport/basehttpadapter.py @@ -6,3 +6,10 @@ def close(self): super().close() if hasattr(self, 'pools'): self.pools.clear() + + # Hotfix for requests 2.32.0: 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) From 2a059a9f19c7b37c6c71c233754c6845e325d1ec Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Tue, 21 May 2024 18:44:08 +0200 Subject: [PATCH 2/3] 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 281897a27..c5996bb3e 100644 --- a/docker/transport/basehttpadapter.py +++ b/docker/transport/basehttpadapter.py @@ -7,9 +7,14 @@ def close(self): 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) From d8e9bcb2780607faf388f8832bff3865eb24dce0 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Tue, 21 May 2024 21:05:36 +0200 Subject: [PATCH 3/3] requests 2.32.0 and 2.32.1 have been yanked. Signed-off-by: Felix Fontein --- docker/transport/basehttpadapter.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/docker/transport/basehttpadapter.py b/docker/transport/basehttpadapter.py index c5996bb3e..2301b6b07 100644 --- a/docker/transport/basehttpadapter.py +++ b/docker/transport/basehttpadapter.py @@ -7,13 +7,6 @@ def close(self): if hasattr(self, 'pools'): self.pools.clear() - # 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):