Use timeout settings from ClientSession (#62)

* use timeout settings from clientsession * use response within context * remove unused import * Remove test * Formatting --------- Co-authored-by: Jan-Philipp Benecke <[email protected]>
jpbede · Feb 17, 2024 · cf680fe · cf680fe
1 parent bcac535
commit cf680fe
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 35 deletions.
diff --git a/aiotankerkoenig/aiotankerkoenig.py b/aiotankerkoenig/aiotankerkoenig.py
@@ -1,7 +1,6 @@
 """Tankerkoenig API client."""
 from __future__ import annotations
 
-import asyncio
 from dataclasses import dataclass
 from importlib import metadata
 import socket
@@ -34,7 +33,6 @@ class Tankerkoenig:
 
     api_key: str
     session: ClientSession | None = None
-    request_timeout: int = 10
 
     _close_session: bool = False
 
@@ -61,12 +59,10 @@ async def _request(self, path: str, params: dict[str, Any]) -> str:
             )
 
         try:
-            async with asyncio.timeout(self.request_timeout):
-                response = await self.session.get(
-                    url,
-                    headers=headers,
-                )
+            async with self.session.get(url, headers=headers) as response:
                 response.raise_for_status()
+                content_type = response.headers.get("Content-Type", "")
+                text = await response.text()
         except TimeoutError as exception:
             msg = "Timeout occurred while connecting to tankerkoenig.de API"
             raise TankerkoenigConnectionTimeoutError(
@@ -81,8 +77,6 @@ async def _request(self, path: str, params: dict[str, Any]) -> str:
             msg = "Error occurred while communicating with the tankerkoenig.de API"
             raise TankerkoenigConnectionError(msg) from exception
 
-        content_type = response.headers.get("Content-Type", "")
-        text = await response.text()
         if "application/json" not in content_type:
             msg = "Unexpected content type from tankerkoenig.de API"
             raise TankerkoenigError(

diff --git a/tests/test_aiotankerkoenig.py b/tests/test_aiotankerkoenig.py
@@ -1,9 +1,7 @@
 """Test the tankerkoenig API client."""
-import asyncio
-from typing import Any
 
 import aiohttp
-from aioresponses import CallbackResult, aioresponses
+from aioresponses import aioresponses
 import pytest
 from syrupy import SnapshotAssertion
 
@@ -12,7 +10,6 @@
     Sort,
     Tankerkoenig,
     TankerkoenigConnectionError,
-    TankerkoenigConnectionTimeoutError,
     TankerkoenigError,
     TankerkoenigInvalidKeyError,
     TankerkoenigRateLimitError,
@@ -22,28 +19,6 @@
 TANKERKOENIG_ENDPOINT = "https://creativecommons.tankerkoenig.de"
 
 
-async def test_timeout(
-    responses: aioresponses,
-) -> None:
-    """Test request timeout."""
-
-    async def response_handler(_: str, **_kwargs: Any) -> CallbackResult:
-        """Response handler for this test."""
-        await asyncio.sleep(2)
-        return CallbackResult(body="Good morning!")
-
-    responses.get(
-        f"{TANKERKOENIG_ENDPOINT}/json/detail.php?apikey=abc123&id=1",
-        callback=response_handler,
-    )
-    async with Tankerkoenig(
-        api_key="abc123",
-        request_timeout=1,
-    ) as tankerkoenig_client:
-        with pytest.raises(TankerkoenigConnectionTimeoutError):
-            await tankerkoenig_client.station_details(station_id="1")
-
-
 async def test_unexpected_server_response(
     responses: aioresponses,
     tankerkoenig_client: Tankerkoenig,