Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Restore AsyncResolver to be the default resolver #8522

Merged
merged 2 commits into from
Jul 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGES/8522.misc.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Restore :py:class:`~aiohttp.resolver.AsyncResolver` to be the default resolver. -- by :user:`bdraco`.

:py:class:`~aiohttp.resolver.AsyncResolver` was disabled by default because
of IPv6 compatibility issues. These issues have been resolved and
:py:class:`~aiohttp.resolver.AsyncResolver` is again now the default resolver.
6 changes: 3 additions & 3 deletions aiohttp/resolver.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@

__all__ = ("ThreadedResolver", "AsyncResolver", "DefaultResolver")


try:
import aiodns

# aiodns_default = hasattr(aiodns.DNSResolver, 'getaddrinfo')
aiodns_default = hasattr(aiodns.DNSResolver, "getaddrinfo")
except ImportError: # pragma: no cover
aiodns = None # type: ignore[assignment]
aiodns_default = False


aiodns_default = False

_NUMERIC_SOCKET_FLAGS = socket.AI_NUMERICHOST | socket.AI_NUMERICSERV
_SUPPORTS_SCOPE_ID = sys.version_info >= (3, 9, 0)

Expand Down
12 changes: 7 additions & 5 deletions tests/test_resolver.py
Original file line number Diff line number Diff line change
Expand Up @@ -311,9 +311,11 @@ async def test_async_resolver_aiodns_not_present(loop: Any, monkeypatch: Any) ->
AsyncResolver()


def test_default_resolver() -> None:
# if getaddrinfo:
# assert DefaultResolver is AsyncResolver
# else:
# assert DefaultResolver is ThreadedResolver
@pytest.mark.skipif(not getaddrinfo, reason="aiodns >=3.2.0 required")
def test_aio_dns_is_default() -> None:
assert DefaultResolver is AsyncResolver


@pytest.mark.skipif(getaddrinfo, reason="aiodns <3.2.0 required")
def test_threaded_resolver_is_default() -> None:
bdraco marked this conversation as resolved.
Show resolved Hide resolved
assert DefaultResolver is ThreadedResolver
bdraco marked this conversation as resolved.
Show resolved Hide resolved
Loading