commit: 864998019f36b3ebe80bba480976e58d11bfec48 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Thu Feb 10 11:41:23 2022 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Thu Feb 10 12:01:51 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86499801
dev-python/requests: remove unused patch(es) Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/24145 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> .../requests/files/requests-2.26.0-test.patch | 30 ------------------- .../files/requests-2.26.0-trustme-dep.patch | 35 ---------------------- 2 files changed, 65 deletions(-) diff --git a/dev-python/requests/files/requests-2.26.0-test.patch b/dev-python/requests/files/requests-2.26.0-test.patch deleted file mode 100644 index 6bbf78871713..000000000000 --- a/dev-python/requests/files/requests-2.26.0-test.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 6552e5374c335d62ba960a74b5b978897c823376 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <[email protected]> -Date: Wed, 28 Jul 2021 10:33:22 +0200 -Subject: [PATCH] Fix creating non-listening sockets in tests on some platforms - -Fix the listen() invocation for the test server not to pass a backlog -value of zero. The value of zero means no backlog which effectively -means that the socket can not accept any connections. This does not -matter for the majority of platforms since the value is only advisory -and the platform tends to go with a bigger backlog anyway. However, -a few platforms (e.g. alpha or riscv Linux) do take the value literally, -and therefore the tests fail since they are unable to connect to -the server. Let Python use a 'default reasonable value' instead. ---- - tests/testserver/server.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/testserver/server.py b/tests/testserver/server.py -index 132221f7c4..92dcb6cb1a 100644 ---- a/tests/testserver/server.py -+++ b/tests/testserver/server.py -@@ -78,7 +78,7 @@ def run(self): - def _create_socket_and_bind(self): - sock = socket.socket() - sock.bind((self.host, self.port)) -- sock.listen(0) -+ sock.listen() - return sock - - def _close_server_sock_ignore_errors(self): diff --git a/dev-python/requests/files/requests-2.26.0-trustme-dep.patch b/dev-python/requests/files/requests-2.26.0-trustme-dep.patch deleted file mode 100644 index 5542bb68da90..000000000000 --- a/dev-python/requests/files/requests-2.26.0-trustme-dep.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 55da533a87afe188282b7f8dfbadeb30c21743d8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <[email protected]> -Date: Sat, 27 Nov 2021 10:33:35 +0100 -Subject: [PATCH] Defer the trustme import until inside the fixture - -Move the trustme import from global scope into the nosan_server fixture -in order to make it possible to deselect the test via command-line -when trustme is not available. ---- - tests/conftest.py | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/tests/conftest.py b/tests/conftest.py -index 099462cf52..4f9b2641b4 100644 ---- a/tests/conftest.py -+++ b/tests/conftest.py -@@ -13,7 +13,6 @@ - - import pytest - from requests.compat import urljoin --import trustme - - - def prepare_url(value): -@@ -38,6 +37,10 @@ def httpbin_secure(httpbin_secure): - - @pytest.fixture - def nosan_server(tmp_path_factory): -+ # delay importing until the fixture in order to make it possible -+ # to deselect the test via command-line when trustme is not available -+ import trustme -+ - tmpdir = tmp_path_factory.mktemp("certs") - ca = trustme.CA() - # only commonName, no subjectAltName
