From 20abff9a66c0289e0dcc74ba19acd65c09aae5c6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 10 Jan 2026 22:46:36 +0000 Subject: [PATCH 1/2] Bump aiodns from 3.6.1 to 4.0.0 Bumps [aiodns](https://github.com/saghul/aiodns) from 3.6.1 to 4.0.0. - [Release notes](https://github.com/saghul/aiodns/releases) - [Changelog](https://github.com/aio-libs/aiodns/blob/master/ChangeLog) - [Commits](https://github.com/saghul/aiodns/compare/v3.6.1...v4.0.0) --- updated-dependencies: - dependency-name: aiodns dependency-version: 4.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- requirements/base-ft.txt | 4 ++-- requirements/base.txt | 4 ++-- requirements/constraints.txt | 4 ++-- requirements/dev.txt | 4 ++-- requirements/lint.txt | 4 ++-- requirements/runtime-deps.txt | 4 ++-- requirements/test-ft.txt | 4 ++-- requirements/test.txt | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/requirements/base-ft.txt b/requirements/base-ft.txt index 3e57dbe03ae..c16b23bb4be 100644 --- a/requirements/base-ft.txt +++ b/requirements/base-ft.txt @@ -4,7 +4,7 @@ # # pip-compile --allow-unsafe --output-file=requirements/base-ft.txt --strip-extras requirements/base-ft.in # -aiodns==3.6.1 +aiodns==4.0.0 # via -r requirements/runtime-deps.in aiohappyeyeballs==2.6.1 # via -r requirements/runtime-deps.in @@ -38,7 +38,7 @@ propcache==0.4.1 # via # -r requirements/runtime-deps.in # yarl -pycares==4.11.0 +pycares==5.0.1 # via aiodns pycparser==2.23 # via cffi diff --git a/requirements/base.txt b/requirements/base.txt index 22ed18b1e71..287690eeda5 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -4,7 +4,7 @@ # # pip-compile --allow-unsafe --output-file=requirements/base.txt --strip-extras requirements/base.in # -aiodns==3.6.1 +aiodns==4.0.0 # via -r requirements/runtime-deps.in aiohappyeyeballs==2.6.1 # via -r requirements/runtime-deps.in @@ -38,7 +38,7 @@ propcache==0.4.1 # via # -r requirements/runtime-deps.in # yarl -pycares==4.11.0 +pycares==5.0.1 # via aiodns pycparser==2.23 # via cffi diff --git a/requirements/constraints.txt b/requirements/constraints.txt index b6c2a5993a6..ad62386a549 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -4,7 +4,7 @@ # # pip-compile --allow-unsafe --output-file=requirements/constraints.txt --strip-extras requirements/constraints.in # -aiodns==3.6.1 +aiodns==4.0.0 # via # -r requirements/lint.in # -r requirements/runtime-deps.in @@ -151,7 +151,7 @@ propcache==0.4.1 # yarl proxy-py==2.4.10 # via -r requirements/test-common.in -pycares==4.11.0 +pycares==5.0.1 # via aiodns pycparser==2.23 # via cffi diff --git a/requirements/dev.txt b/requirements/dev.txt index ab58796932b..a9a60c4b4f5 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -4,7 +4,7 @@ # # pip-compile --allow-unsafe --output-file=requirements/dev.txt --strip-extras requirements/dev.in # -aiodns==3.6.1 +aiodns==4.0.0 # via # -r requirements/lint.in # -r requirements/runtime-deps.in @@ -148,7 +148,7 @@ propcache==0.4.1 # yarl proxy-py==2.4.10 # via -r requirements/test-common.in -pycares==4.11.0 +pycares==5.0.1 # via aiodns pycparser==2.23 # via cffi diff --git a/requirements/lint.txt b/requirements/lint.txt index 33aff888d0a..0e9c476081e 100644 --- a/requirements/lint.txt +++ b/requirements/lint.txt @@ -4,7 +4,7 @@ # # pip-compile --allow-unsafe --output-file=requirements/lint.txt --resolver=backtracking --strip-extras requirements/lint.in # -aiodns==3.6.1 +aiodns==4.0.0 # via -r requirements/lint.in annotated-types==0.7.0 # via pydantic @@ -65,7 +65,7 @@ pluggy==1.6.0 # via pytest pre-commit==4.5.1 # via -r requirements/lint.in -pycares==4.11.0 +pycares==5.0.1 # via aiodns pycparser==2.23 # via cffi diff --git a/requirements/runtime-deps.txt b/requirements/runtime-deps.txt index bace48ca565..d1584113eee 100644 --- a/requirements/runtime-deps.txt +++ b/requirements/runtime-deps.txt @@ -4,7 +4,7 @@ # # pip-compile --allow-unsafe --output-file=requirements/runtime-deps.txt --strip-extras requirements/runtime-deps.in # -aiodns==3.6.1 +aiodns==4.0.0 # via -r requirements/runtime-deps.in aiohappyeyeballs==2.6.1 # via -r requirements/runtime-deps.in @@ -34,7 +34,7 @@ propcache==0.4.1 # via # -r requirements/runtime-deps.in # yarl -pycares==4.11.0 +pycares==5.0.1 # via aiodns pycparser==2.23 # via cffi diff --git a/requirements/test-ft.txt b/requirements/test-ft.txt index f66243ea413..c09e61ef68f 100644 --- a/requirements/test-ft.txt +++ b/requirements/test-ft.txt @@ -4,7 +4,7 @@ # # pip-compile --allow-unsafe --output-file=requirements/test-ft.txt --strip-extras requirements/test-ft.in # -aiodns==3.6.1 +aiodns==4.0.0 # via -r requirements/runtime-deps.in aiohappyeyeballs==2.6.1 # via -r requirements/runtime-deps.in @@ -89,7 +89,7 @@ propcache==0.4.1 # yarl proxy-py==2.4.10 # via -r requirements/test-common.in -pycares==4.11.0 +pycares==5.0.1 # via aiodns pycparser==2.23 # via cffi diff --git a/requirements/test.txt b/requirements/test.txt index d49bf0b3dc9..0b35cfd86f6 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -4,7 +4,7 @@ # # pip-compile --allow-unsafe --output-file=requirements/test.txt --strip-extras requirements/test.in # -aiodns==3.6.1 +aiodns==4.0.0 # via -r requirements/runtime-deps.in aiohappyeyeballs==2.6.1 # via -r requirements/runtime-deps.in @@ -89,7 +89,7 @@ propcache==0.4.1 # yarl proxy-py==2.4.10 # via -r requirements/test-common.in -pycares==4.11.0 +pycares==5.0.1 # via aiodns pycparser==2.23 # via cffi From ebd0d694c7d2fbc82963c63640c7a6a8b0b79dc5 Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Sat, 10 Jan 2026 12:55:58 -1000 Subject: [PATCH 2/2] fix type conflict --- aiohttp/resolver.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/aiohttp/resolver.py b/aiohttp/resolver.py index 85c36da0c31..84b5ffb667e 100644 --- a/aiohttp/resolver.py +++ b/aiohttp/resolver.py @@ -127,8 +127,7 @@ async def resolve( hosts: list[ResolveResult] = [] for node in resp.nodes: address: tuple[bytes, int] | tuple[bytes, int, int, int] = node.addr - family = node.family - if family == socket.AF_INET6: + if node.family == socket.AF_INET6: if len(address) > 3 and address[3]: # This is essential for link-local IPv6 addresses. # LL IPv6 is a VERY rare case. Strictly speaking, we should use @@ -142,7 +141,7 @@ async def resolve( resolved_host = address[0].decode("ascii") port = address[1] else: # IPv4 - assert family == socket.AF_INET + assert node.family == socket.AF_INET resolved_host = address[0].decode("ascii") port = address[1] hosts.append( @@ -150,7 +149,7 @@ async def resolve( hostname=host, host=resolved_host, port=port, - family=family, + family=node.family, proto=0, flags=_NUMERIC_SOCKET_FLAGS, )