From 86e1eefb344833b76f6eeeadaf93fb8f9fb038d3 Mon Sep 17 00:00:00 2001 From: jxy_git Date: Tue, 2 Dec 2025 14:34:58 +0800 Subject: [PATCH] adapters: fix for requests 2.32.2+ (cherry picked from commit 01799ba3c233ec182a1241700408247e68e25ca0) --- ...ort-adapters-fix-for-requests-2.32.2.patch | 30 +++++++++++++++++++ python-requests-unixsocket.spec | 11 +++++-- 2 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 backport-adapters-fix-for-requests-2.32.2.patch diff --git a/backport-adapters-fix-for-requests-2.32.2.patch b/backport-adapters-fix-for-requests-2.32.2.patch new file mode 100644 index 0000000..240b1c2 --- /dev/null +++ b/backport-adapters-fix-for-requests-2.32.2.patch @@ -0,0 +1,30 @@ +From 1723b7a76324aab75e1938d7a80a875b349e6761 Mon Sep 17 00:00:00 2001 +From: jxy_git +Date: Mon, 1 Dec 2025 17:56:49 +0800 +Subject: [PATCH] adapters: fix for requests 2.32.2+ + +Original-Author: Simon Deziel +Signed-off-by: jxy_git + +--- + requests_unixsocket/adapters.py | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/requests_unixsocket/adapters.py b/requests_unixsocket/adapters.py +index 83e1400..c3c73cc 100644 +--- a/requests_unixsocket/adapters.py ++++ b/requests_unixsocket/adapters.py +@@ -63,6 +63,10 @@ class UnixAdapter(HTTPAdapter): + pool_connections, dispose_func=lambda p: p.close() + ) + ++ # Fix for requests 2.32.2+: https://github.com/psf/requests/pull/6710 ++ def get_connection_with_tls_context(self, request, verify, proxies=None, cert=None): ++ return self.get_connection(request.url, proxies) ++ + def get_connection(self, url, proxies=None): + proxies = proxies or {} + proxy = proxies.get(urlparse(url.lower()).scheme) +-- +2.43.0 + diff --git a/python-requests-unixsocket.spec b/python-requests-unixsocket.spec index 252e51e..1b830fd 100644 --- a/python-requests-unixsocket.spec +++ b/python-requests-unixsocket.spec @@ -2,11 +2,13 @@ Name: python-requests-unixsocket Version: 0.3.0 -Release: 1 +Release: 2 Summary: Use requests to talk HTTP via a UNIX domain socket -License: ASL 2.0 +License: Apache-2.0 URL: https://github.com/msabramo/requests-unixsocket Source0: https://pypi.python.org/packages/source/r/requests-unixsocket/requests-unixsocket-%{version}.tar.gz +# https://github.com/msabramo/requests-unixsocket/pull/72/commits/8b02ed531d8def03b4cf767e8a925be09db43dff +Patch3000: backport-adapters-fix-for-requests-2.32.2.patch BuildArch: noarch %description @@ -29,7 +31,7 @@ BuildRequires: python3dist(waitress) Use requests to talk HTTP via a UNIX domain socket %prep -%autosetup -n requests-unixsocket-%{version} +%autosetup -p1 -n requests-unixsocket-%{version} sed -i '1d' requests_unixsocket/tests/test_requests_unixsocket.py sed -i '1d' setup.py rm pytest.ini @@ -52,6 +54,9 @@ sed -i '/pytest-capturelog/d' test-requirements.txt %{python3_sitelib}/requests_unixsocket-%{version}-py%{python3_version}.egg-info %changelog +* Tue Dec 02 2025 jiangxinyu - 0.3.0-2 +- adapters: fix for requests 2.32.2+ + * Thu Mar 14 2024 jiangxinyu - 0.3.0-1 - Update package to version 0.3.0 -- Gitee