Preserve default total client timeout value

CHANGES/7274.feature

@@ -0,0 +1 @@
+Changed default value for ``ClientTimeout.total`` so that the default is always present, even if not explicitly specified.

CONTRIBUTORS.txt

@@ -351,6 +351,7 @@ Ye Cao
 Yegor Roganov
 Yifei Kong
 Young-Ho Cha
+Yuri Sukhov
 Yuriy Shatrov
 Yury Pliner
 Yury Selivanov

aiohttp/client.py

@@ -31,7 +31,7 @@
 )
 
 from multidict import CIMultiDict, MultiDict, MultiDictProxy, istr
-from typing_extensions import Final, final
+from typing_extensions import final
 from yarl import URL
 
 from . import hdrs, http, payload
@@ -134,7 +134,7 @@
 
 @dataclasses.dataclass(frozen=True)
 class ClientTimeout:
-    total: Optional[float] = None
+    total: Optional[float] = 5 * 60  # 5 minute default timeout
     connect: Optional[float] = None
     sock_read: Optional[float] = None
     sock_connect: Optional[float] = None
@@ -154,9 +154,6 @@ class ClientTimeout:
     # to overwrite the defaults
 
 
-# 5 Minute default read timeout
-DEFAULT_TIMEOUT: Final[ClientTimeout] = ClientTimeout(total=5 * 60)
-
 _RetType = TypeVar("_RetType")
 
 
@@ -257,7 +254,7 @@ def __init__(
         self._version = version
         self._json_serialize = json_serialize
         if timeout is sentinel or timeout is None:
-            self._timeout = DEFAULT_TIMEOUT
+            self._timeout = ClientTimeout()
         else:
             self._timeout = timeout
         self._raise_for_status = raise_for_status

docs/client_reference.rst

@@ -1684,7 +1684,7 @@ Utilities
 ClientTimeout
 ^^^^^^^^^^^^^
 
-.. class:: ClientTimeout(*, total=None, connect=None, \
+.. class:: ClientTimeout(*, total=5*60, connect=None, \
                          sock_connect=None, sock_read=None)
 
    A data class for client timeout settings.
@@ -1695,7 +1695,7 @@ ClientTimeout
 
       Total number of seconds for the whole request.
 
-      :class:`float`, ``None`` by default.
+      :class:`float`, 300 seconds (5 min) by default.
 
    .. attribute:: connect
 

tests/test_client_session.py

@@ -790,7 +790,7 @@ async def test_client_session_custom_attr() -> None:
 
 async def test_client_session_timeout_default_args(loop: Any) -> None:
     session1 = ClientSession()
-    assert session1.timeout == client.DEFAULT_TIMEOUT
+    assert session1.timeout == client.ClientTimeout(total=5 * 60)
     await session1.close()