[PR #8968/8daecf5c backport][3.10] List specific timeouts for each ex…

…ception (#8981) **This is a backport of PR #8968 as merged into master (8daecf5).** Co-authored-by: Sam Bull <[email protected]>
aio-libs · Sep 2, 2024 · c733c68 · c733c68
1 parent 5dd9534
commit c733c68
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CHANGES/8968.doc.rst b/CHANGES/8968.doc.rst
@@ -0,0 +1 @@
+Clarified which timeout exceptions happen on which timeouts -- by :user:`Dreamsorcerer`.
diff --git a/docs/client_reference.rst b/docs/client_reference.rst
@@ -2309,17 +2309,20 @@ Connection errors
 
    Server operation timeout: read timeout, etc.
 
+   To catch all timeouts, including the ``total`` timeout, use
+   :exc:`asyncio.TimeoutError`.
+
    Derived from :exc:`ServerConnectionError` and :exc:`asyncio.TimeoutError`
 
 .. class:: ConnectionTimeoutError
 
-   Connection timeout on request: e.g. read timeout.
+   Connection timeout on ``connect`` and ``sock_connect`` timeouts.
 
    Derived from :exc:`ServerTimeoutError`
 
 .. class:: SocketTimeoutError
 
-   Reading from socket timeout.
+   Reading from socket timeout on ``sock_read`` timeout.
 
    Derived from :exc:`ServerTimeoutError`
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Clarified which timeout exceptions happen on which timeouts -- by :user:`Dreamsorcerer`.