merge with recent branch

Author: SoldierSacha

src/mcp/client/auth/oauth2.py

@@ -680,9 +680,7 @@ async def async_auth_flow(self, request: httpx.Request) -> AsyncGenerator[httpx.
                     self._select_scopes(response)
 
                     # Step 3: Discover OAuth metadata (with fallback for legacy servers)
-                    discovery_urls = self._get_discovery_urls(
-                        self.context.auth_server_url or self.context.server_url
-                    )
+                    discovery_urls = self._get_discovery_urls(self.context.auth_server_url or self.context.server_url)
                     for url in discovery_urls:
                         oauth_metadata_request = self._create_oauth_metadata_request(url)
                         oauth_metadata_response = yield oauth_metadata_request

tests/server/fastmcp/resources/test_file_resources.py

@@ -100,6 +100,7 @@ async def test_missing_file_error(self, temp_file: Path):
         with pytest.raises(ValueError, match="Error reading file"):
             await resource.read()
 
+
 @pytest.mark.skipif(os.name == "nt", reason="File permissions behave differently on Windows")
 @pytest.mark.anyio
 async def test_permission_error(temp_file: Path):