diff --git a/aiohttp/resolver.py b/aiohttp/resolver.py index 8840a1ca3e1..d29ffff1d95 100644 --- a/aiohttp/resolver.py +++ b/aiohttp/resolver.py @@ -118,8 +118,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 @@ -133,7 +132,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( @@ -141,7 +140,7 @@ async def resolve( hostname=host, host=resolved_host, port=port, - family=family, + family=node.family, proto=0, flags=_NUMERIC_SOCKET_FLAGS, ) diff --git a/requirements/base-ft.txt b/requirements/base-ft.txt index a9346182f20..f702a7cf0bd 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 @@ -36,7 +36,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 cbf92ac9b66..94528a3f74a 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 @@ -36,7 +36,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 a28f82a959e..37a06e28ec4 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 @@ -69,7 +69,7 @@ exceptiongroup==1.3.1 # via pytest execnet==2.1.2 # via pytest-xdist -filelock==3.20.2 +filelock==3.20.3 # via virtualenv forbiddenfruit==0.1.4 # via blockbuster @@ -130,7 +130,7 @@ packaging==25.0 # pytest # sphinx # wheel -pathspec==1.0.2 +pathspec==1.0.3 # via mypy pip-tools==7.5.2 # via -r requirements/dev.in @@ -152,7 +152,7 @@ proxy-py==2.4.10 # via # -r requirements/lint.in # -r requirements/test-common.in -pycares==4.11.0 +pycares==5.0.1 # via aiodns pycparser==2.23 # via cffi @@ -193,7 +193,7 @@ pytest-xdist==3.8.0 # via -r requirements/test-common.in python-dateutil==2.9.0.post0 # via freezegun -python-on-whales==0.79.0 +python-on-whales==0.80.0 # via # -r requirements/lint.in # -r requirements/test-common.in @@ -275,7 +275,7 @@ uvloop==0.21.0 ; platform_system != "Windows" # -r requirements/lint.in valkey==6.1.1 # via -r requirements/lint.in -virtualenv==20.36.0 +virtualenv==20.36.1 # via pre-commit wait-for-it==2.3.0 # via -r requirements/test-common.in diff --git a/requirements/dev.txt b/requirements/dev.txt index bfebee41c38..caec288a434 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 @@ -67,7 +67,7 @@ exceptiongroup==1.3.1 # via pytest execnet==2.1.2 # via pytest-xdist -filelock==3.20.2 +filelock==3.20.3 # via virtualenv forbiddenfruit==0.1.4 # via blockbuster @@ -127,7 +127,7 @@ packaging==25.0 # pytest # sphinx # wheel -pathspec==1.0.2 +pathspec==1.0.3 # via mypy pip-tools==7.5.2 # via -r requirements/dev.in @@ -149,7 +149,7 @@ proxy-py==2.4.10 # via # -r requirements/lint.in # -r requirements/test-common.in -pycares==4.11.0 +pycares==5.0.1 # via aiodns pycparser==2.23 # via cffi @@ -188,7 +188,7 @@ pytest-xdist==3.8.0 # via -r requirements/test-common.in python-dateutil==2.9.0.post0 # via freezegun -python-on-whales==0.79.0 +python-on-whales==0.80.0 # via # -r requirements/lint.in # -r requirements/test-common.in @@ -265,7 +265,7 @@ uvloop==0.21.0 ; platform_system != "Windows" and implementation_name == "cpytho # -r requirements/lint.in valkey==6.1.1 # via -r requirements/lint.in -virtualenv==20.36.0 +virtualenv==20.36.1 # via pre-commit wait-for-it==2.3.0 # via -r requirements/test-common.in diff --git a/requirements/lint.txt b/requirements/lint.txt index 168b923d67b..3c6a87dc9e4 100644 --- a/requirements/lint.txt +++ b/requirements/lint.txt @@ -4,7 +4,7 @@ # # pip-compile --allow-unsafe --output-file=requirements/lint.txt --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 @@ -29,7 +29,7 @@ distlib==0.4.0 # via virtualenv exceptiongroup==1.3.1 # via pytest -filelock==3.20.2 +filelock==3.20.3 # via virtualenv forbiddenfruit==0.1.4 # via blockbuster @@ -57,7 +57,7 @@ nodeenv==1.10.0 # via pre-commit packaging==25.0 # via pytest -pathspec==1.0.2 +pathspec==1.0.3 # via mypy platformdirs==4.5.1 # via virtualenv @@ -67,7 +67,7 @@ pre-commit==4.5.1 # via -r requirements/lint.in proxy-py==2.4.10 # via -r requirements/lint.in -pycares==4.11.0 +pycares==5.0.1 # via aiodns pycparser==2.23 # via cffi @@ -90,7 +90,7 @@ pytest-mock==3.15.1 # via -r requirements/lint.in python-dateutil==2.9.0.post0 # via freezegun -python-on-whales==0.79.0 +python-on-whales==0.80.0 # via -r requirements/lint.in pyyaml==6.0.3 # via pre-commit @@ -123,7 +123,7 @@ uvloop==0.21.0 ; platform_system != "Windows" # via -r requirements/lint.in valkey==6.1.1 # via -r requirements/lint.in -virtualenv==20.36.0 +virtualenv==20.36.1 # via pre-commit zlib-ng==1.0.0 # via -r requirements/lint.in diff --git a/requirements/runtime-deps.txt b/requirements/runtime-deps.txt index eb0434c07bc..b2a455559ce 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 @@ -32,7 +32,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-common.txt b/requirements/test-common.txt index ff2632f60f2..7ebd1418502 100644 --- a/requirements/test-common.txt +++ b/requirements/test-common.txt @@ -46,7 +46,7 @@ mypy-extensions==1.1.0 # via mypy packaging==25.0 # via pytest -pathspec==1.0.2 +pathspec==1.0.3 # via mypy pkgconfig==1.5.5 # via -r requirements/test-common.in @@ -83,7 +83,7 @@ pytest-xdist==3.8.0 # via -r requirements/test-common.in python-dateutil==2.9.0.post0 # via freezegun -python-on-whales==0.79.0 +python-on-whales==0.80.0 # via -r requirements/test-common.in rich==14.2.0 # via pytest-codspeed diff --git a/requirements/test-ft.txt b/requirements/test-ft.txt index f31e1a21888..f8f2bf5db44 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 @@ -73,7 +73,7 @@ packaging==25.0 # via # gunicorn # pytest -pathspec==1.0.2 +pathspec==1.0.3 # via mypy pkgconfig==1.5.5 # via -r requirements/test-common.in @@ -87,7 +87,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 @@ -116,7 +116,7 @@ pytest-xdist==3.8.0 # via -r requirements/test-common.in python-dateutil==2.9.0.post0 # via freezegun -python-on-whales==0.79.0 +python-on-whales==0.80.0 # via -r requirements/test-common.in rich==14.2.0 # via pytest-codspeed diff --git a/requirements/test.txt b/requirements/test.txt index c41462056bd..6215d3e8d28 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 @@ -73,7 +73,7 @@ packaging==25.0 # via # gunicorn # pytest -pathspec==1.0.2 +pathspec==1.0.3 # via mypy pkgconfig==1.5.5 # via -r requirements/test-common.in @@ -87,7 +87,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 @@ -116,7 +116,7 @@ pytest-xdist==3.8.0 # via -r requirements/test-common.in python-dateutil==2.9.0.post0 # via freezegun -python-on-whales==0.79.0 +python-on-whales==0.80.0 # via -r requirements/test-common.in rich==14.2.0 # via pytest-codspeed