Skip to content

Commit

Permalink
Update Resolvers description in Client reference docs (#3642)
Browse files Browse the repository at this point in the history
  • Loading branch information
JanBednarik authored and asvetlov committed May 10, 2019
1 parent 00d9a48 commit 4b9adf7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
1 change: 1 addition & 0 deletions CHANGES/3642.doc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Modify documentation for Resolvers to make it clear that asynchronous resolver is not used by default when aiodns is installed.
9 changes: 4 additions & 5 deletions docs/client_reference.rst
Original file line number Diff line number Diff line change
Expand Up @@ -862,15 +862,14 @@ TCPConnector
If *limit* is ``0`` the connector has no limit (default: 0).

:param aiohttp.abc.AbstractResolver resolver: custom resolver
instance to use. ``aiohttp.DefaultResolver`` by
default (asynchronous if ``aiodns>=1.1`` is installed).
instance to use. ``aiohttp.DefaultResolver`` by default.

Custom resolvers allow to resolve hostnames differently than the
way the host is configured.

The resolver is ``aiohttp.ThreadedResolver`` by default,
asynchronous version is pretty robust but might fail in
very rare cases.
The resolver is ``aiohttp.ThreadedResolver`` by default. Asynchronous
version ``aiohttp.AsyncResolver`` (requires ``aiodns>=1.1``) is pretty
robust but might fail in very rare cases.

:param int family: TCP socket family, both IPv4 and IPv6 by default.
For *IPv4* only use :const:`socket.AF_INET`,
Expand Down

0 comments on commit 4b9adf7

Please sign in to comment.