Avoid timeout match suppressions

Author: adamtheturtle

pyproject.toml

@@ -333,7 +333,6 @@ log_cli = true
 [tool.coverage]
 run.branch = true
 report.exclude_also = [
-    "case _ as unreachable:\n\\s*assert_never\\(",
     "if TYPE_CHECKING:",
 ]
 report.show_missing = true

spelling_private_dict.txt

@@ -79,7 +79,6 @@ plugins
 png
 pragma
 py
-pyrefly
 pyright
 pytest
 readme
@@ -98,7 +97,6 @@ todo
 traceback
 travis
 txt
-ty
 unmocked
 untyped
 url

src/vws/transports.py

@@ -1,7 +1,7 @@
 """HTTP transport implementations for VWS clients."""
 
 from collections.abc import Awaitable
-from typing import Protocol, Self, assert_never, runtime_checkable
+from typing import Protocol, Self, runtime_checkable
 
 import httpx
 import requests
@@ -150,22 +150,21 @@ def __call__(
             A Response populated from the httpx response.
         """
         match request_timeout:
-            case (connect_timeout, read_timeout):
+            case tuple() as timeout:
+                connect_timeout, read_timeout = timeout
                 httpx_timeout = httpx.Timeout(
                     connect=connect_timeout,
                     read=read_timeout,
                     write=None,
                     pool=None,
                 )
-            case float() | int() as timeout:
+            case timeout:
                 httpx_timeout = httpx.Timeout(
                     connect=timeout,
                     read=timeout,
                     write=None,
                     pool=None,
                 )
-            case _ as unreachable:
-                assert_never(unreachable)  # pyrefly: ignore[bad-argument-type]  # ty: ignore[type-assertion-failure]
 
         httpx_response = self._client.request(
             method=method,
@@ -275,22 +274,21 @@ async def __call__(
             A Response populated from the httpx response.
         """
         match request_timeout:
-            case (connect_timeout, read_timeout):
+            case tuple() as timeout:
+                connect_timeout, read_timeout = timeout
                 httpx_timeout = httpx.Timeout(
                     connect=connect_timeout,
                     read=read_timeout,
                     write=None,
                     pool=None,
                 )
-            case float() | int() as timeout:
+            case timeout:
                 httpx_timeout = httpx.Timeout(
                     connect=timeout,
                     read=timeout,
                     write=None,
                     pool=None,
                 )
-            case _ as unreachable:
-                assert_never(unreachable)  # pyrefly: ignore[bad-argument-type]  # ty: ignore[type-assertion-failure]
 
         httpx_response = await self._client.request(
             method=method,

tests/test_transports.py

@@ -61,6 +61,28 @@ def test_tuple_timeout() -> None:
         assert isinstance(response, Response)
         assert response.status_code == HTTPStatus.OK
 
+    @staticmethod
+    @respx.mock
+    def test_int_timeout() -> None:
+        """``HTTPXTransport`` works with an int timeout."""
+        route = respx.post(url="https://example.com/test").mock(
+            return_value=httpx.Response(
+                status_code=HTTPStatus.OK,
+                text="OK",
+            ),
+        )
+        transport = HTTPXTransport()
+        response = transport(
+            method="POST",
+            url="https://example.com/test",
+            headers={"Content-Type": "text/plain"},
+            data=b"hello",
+            request_timeout=30,
+        )
+        assert route.called
+        assert isinstance(response, Response)
+        assert response.status_code == HTTPStatus.OK
+
     @staticmethod
     @respx.mock
     def test_context_manager() -> None:
@@ -137,6 +159,29 @@ async def test_tuple_timeout() -> None:
         assert isinstance(response, Response)
         assert response.status_code == HTTPStatus.OK
 
+    @staticmethod
+    @pytest.mark.asyncio
+    @respx.mock
+    async def test_int_timeout() -> None:
+        """``AsyncHTTPXTransport`` works with an int timeout."""
+        route = respx.post(url="https://example.com/test").mock(
+            return_value=httpx.Response(
+                status_code=HTTPStatus.OK,
+                text="OK",
+            ),
+        )
+        transport = AsyncHTTPXTransport()
+        response = await transport(
+            method="POST",
+            url="https://example.com/test",
+            headers={"Content-Type": "text/plain"},
+            data=b"hello",
+            request_timeout=30,
+        )
+        assert route.called
+        assert isinstance(response, Response)
+        assert response.status_code == HTTPStatus.OK
+
     @staticmethod
     @pytest.mark.asyncio
     @respx.mock