Add hotfix for requests 2.32.0.

ansible-collections · May 20, 2024 · ab09d5e · ab09d5e
1 parent 68dd597
commit ab09d5e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/changelogs/fragments/862-requests.yml b/changelogs/fragments/862-requests.yml
@@ -0,0 +1,2 @@
+bugfixes:
+  - "vendored Docker SDK for Python - include a hotfix for requests 2.32.0 compatibility (https://github.com/ansible-collections/community.docker/issues/860, https://github.com/docker/docker-py/issues/3256, https://github.com/ansible-collections/community.docker/pull/861)."
diff --git a/plugins/module_utils/_api/transport/basehttpadapter.py b/plugins/module_utils/_api/transport/basehttpadapter.py
@@ -18,3 +18,10 @@ def close(self):
         super(BaseHTTPAdapter, self).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, **kwargs):
+        return self.get_connection(request.url, kwargs.get('proxies'))