merge with recent branch

Author: SoldierSacha

tests/unit/client/test_oauth2_providers.py

@@ -1,7 +1,8 @@
 import base64
 import time
+from collections.abc import Iterator
 from types import SimpleNamespace, TracebackType
-from typing import Iterator, cast
+from typing import cast
 
 import httpx
 import pytest

tests/unit/client/test_stdio_client.py

@@ -1,10 +1,11 @@
 from __future__ import annotations
 
-import anyio
-import pytest
 from types import TracebackType
 from typing import Any
 
+import anyio
+import pytest
+
 from mcp.client import stdio as stdio_module
 from mcp.client.stdio import StdioServerParameters, stdio_client
 
@@ -22,7 +23,7 @@ def __init__(self) -> None:
         self.stdin = DummyStdin()
         self.stdout = object()
 
-    async def __aenter__(self) -> "DummyProcess":
+    async def __aenter__(self) -> DummyProcess:
         return self
 
     async def __aexit__(
@@ -41,7 +42,7 @@ class BrokenPipeStream:
     def __init__(self, *args: Any, **kwargs: Any) -> None:
         pass
 
-    def __aiter__(self) -> "BrokenPipeStream":
+    def __aiter__(self) -> BrokenPipeStream:
         return self
 
     async def __anext__(self) -> str:

tests/unit/server/auth/test_token_handler.py

@@ -153,6 +153,6 @@ async def test_handle_route_refresh_token_branch() -> None:
 
     assert response.status_code == 200
     body = response.body
-    assert isinstance(body, (bytes, bytearray, memoryview))
+    assert isinstance(body, bytes | bytearray | memoryview)
     payload = json.loads(bytes(body).decode())
     assert payload["access_token"] == "refreshed-token"