From 02e436280ec28cb12aba105a57adb0c2fbbd4bf7 Mon Sep 17 00:00:00 2001 From: rachitm022 Date: Mon, 16 Nov 2026 15:17:15 +0530 Subject: [PATCH 1/2] fix(signing): use public httpcore2 socket option type (cherry picked from commit 2d44e5e0ba9f4984c402483b5e13c131584471e9) --- src/adcp/signing/ip_pinned_transport.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/adcp/signing/ip_pinned_transport.py b/src/adcp/signing/ip_pinned_transport.py index b3735180ad..0ec48b4a49 100644 --- a/src/adcp/signing/ip_pinned_transport.py +++ b/src/adcp/signing/ip_pinned_transport.py @@ -109,7 +109,7 @@ if TYPE_CHECKING: from httpcore._backends.base import SOCKET_OPTION - from httpcore2._backends.base import SOCKET_OPTION as SOCKET_OPTION2 + from httpcore2 import SOCKET_OPTION as SOCKET_OPTION2 __all__ = [ From 0048e4b0341ef9d6c87f49288aa13f5f651a3f52 Mon Sep 17 00:00:00 2001 From: rachitm022 Date: Mon, 16 Nov 2026 16:08:54 +0530 Subject: [PATCH 2/2] test(signing): compare httpcore backend call shapes (cherry picked from commit 65e90c7773e6211d608bd7e857d7e03dc240c35e) --- .../signing/test_ip_pinned_transport.py | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/tests/conformance/signing/test_ip_pinned_transport.py b/tests/conformance/signing/test_ip_pinned_transport.py index 997d6d0f43..1524b3516b 100644 --- a/tests/conformance/signing/test_ip_pinned_transport.py +++ b/tests/conformance/signing/test_ip_pinned_transport.py @@ -96,10 +96,17 @@ def test_httpcore2_backends_match_the_httpcore_signatures() -> None: """The ``2``-suffixed transports pin through the same extension point in the httpcore2 generation. One signature test covers both, because the port is only valid while the two agree.""" - assert inspect.signature(SyncBackend2.connect_tcp) == inspect.signature(SyncBackend.connect_tcp) - assert inspect.signature(AnyIOBackend2.connect_tcp) == inspect.signature( - AnyIOBackend.connect_tcp - ) + sync_params = inspect.signature(SyncBackend.connect_tcp).parameters.values() + sync2_params = inspect.signature(SyncBackend2.connect_tcp).parameters.values() + assert [(param.name, param.kind, param.default) for param in sync2_params] == [ + (param.name, param.kind, param.default) for param in sync_params + ] + + async_params = inspect.signature(AnyIOBackend.connect_tcp).parameters.values() + async2_params = inspect.signature(AnyIOBackend2.connect_tcp).parameters.values() + assert [(param.name, param.kind, param.default) for param in async2_params] == [ + (param.name, param.kind, param.default) for param in async_params + ] assert "network_backend" in inspect.signature(httpcore2.ConnectionPool.__init__).parameters assert "network_backend" in inspect.signature(httpcore2.AsyncConnectionPool.__init__).parameters @@ -146,9 +153,9 @@ def test_resolve_normalizes_idn_hostname_to_punycode() -> None: # Patch getaddrinfo to short-circuit DNS for the IDN test host. def fake_getaddrinfo(host, _port, *_args, **_kwargs): # Must be called with the ASCII-encoded form. - assert ( - host == "xn--mnchen-3ya.example" - ), f"resolve_and_validate_host should IDNA-encode; got {host!r}" + assert host == "xn--mnchen-3ya.example", ( + f"resolve_and_validate_host should IDNA-encode; got {host!r}" + ) return [(socket.AF_INET, 0, 0, "", ("8.8.8.8", 0))] with patch("adcp.signing.jwks.socket.getaddrinfo", side_effect=fake_getaddrinfo):