Clientsession timeout property (#4193)

aio-libs · Oct 18, 2019 · c0a36b2 · c0a36b2
1 parent 60f01cc
commit c0a36b2
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 0 deletions.
diff --git a/CHANGES/4191.feature b/CHANGES/4191.feature
@@ -0,0 +1 @@
+Added `ClientSession.timeout` property.
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
@@ -223,6 +223,7 @@ Stepan Pletnev
 Stephen Granade
 Steven Seguin
 Sunghyun Hwang
+Sunit Deshpande
 Sviatoslav Bulbakha
 Sviatoslav Sydorenko
 Taha Jahangir

diff --git a/aiohttp/client.py b/aiohttp/client.py
@@ -952,6 +952,11 @@ def loop(self) -> asyncio.AbstractEventLoop:
                       stacklevel=2)
         return self._loop
 
+    @property
+    def timeout(self) -> Union[object, ClientTimeout]:
+        """Timeout for the session."""
+        return self._timeout
+
     def detach(self) -> None:
         """Detach connector from session without closing the former.
 

diff --git a/tests/test_client_session.py b/tests/test_client_session.py
@@ -719,6 +719,16 @@ async def test_client_session_timeout_args(loop) -> None:
                       conn_timeout=30 * 60)
 
 
+async def test_client_session_timeout_default_args(loop) -> None:
+    session1 = ClientSession()
+    assert session1.timeout == client.DEFAULT_TIMEOUT
+
+
+async def test_client_session_timeout_argument() -> None:
+    session = ClientSession(timeout=500)
+    assert session.timeout == 500
+
+
 async def test_requote_redirect_url_default() -> None:
     session = ClientSession()
     assert session.requote_redirect_url