Control: tag 1073393 patch

On Sun, Jun 16, 2024 at 03:09:49PM +0200, Lucas Nussbaum wrote:
> During a rebuild of all packages in sid, your package failed to build
> on amd64.
[...]
> > E   urllib3.exceptions.URLSchemeUnknown: Not supported URL scheme http+unix

I think a minimal viable approach here would be to cherry-pick
https://github.com/msabramo/requests-unixsocket/pull/72.  Would you
consider this?

As well as fixing #1073393, this would allow downgrading #1073180 to
non-RC (though you could still leave it open for future consideration of
switching to that fork).

diff -Nru python-requests-unixsocket-0.3.0/debian/patches/requests-2.32.2.patch 
python-requests-unixsocket-0.3.0/debian/patches/requests-2.32.2.patch
--- python-requests-unixsocket-0.3.0/debian/patches/requests-2.32.2.patch       
1970-01-01 01:00:00.000000000 +0100
+++ python-requests-unixsocket-0.3.0/debian/patches/requests-2.32.2.patch       
2024-08-16 18:08:17.000000000 +0100
@@ -0,0 +1,21 @@
+Description: adapters: fix for requests 2.32.2+
+Author: Simon Deziel <simon.dez...@canonical.com>
+Origin: other, https://github.com/msabramo/requests-unixsocket/pull/72
+Bug-Debian: https://bugs.debian.org/1073393
+Last-Update: 2024-08-16
+
+Index: b/requests_unixsocket/adapters.py
+===================================================================
+--- a/requests_unixsocket/adapters.py
++++ b/requests_unixsocket/adapters.py
+@@ -58,6 +58,10 @@
+             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)
diff -Nru python-requests-unixsocket-0.3.0/debian/patches/series 
python-requests-unixsocket-0.3.0/debian/patches/series
--- python-requests-unixsocket-0.3.0/debian/patches/series      2024-04-29 
14:10:08.000000000 +0100
+++ python-requests-unixsocket-0.3.0/debian/patches/series      2024-08-16 
18:07:54.000000000 +0100
@@ -1,2 +1,3 @@
 0001-Inherit-HTTPConnection-through-urllib3.connection-no.patch
 testutils-fix-test-flake-on-HEAD-request.patch
+requests-2.32.2.patch

Thanks,

-- 
Colin Watson (he/him)                              [cjwat...@debian.org]

Reply via email to