From 53c486ccd1b2dfe5a3f60dd222b257d4516a73bf Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Wed, 6 Nov 2024 15:59:31 -0600
Subject: [PATCH] Bump aiohttp to 3.11.0b3 (#129363)

---
 homeassistant/components/websocket_api/http.py | 8 +-------
 homeassistant/package_constraints.txt          | 2 +-
 pyproject.toml                                 | 2 +-
 requirements.txt                               | 2 +-
 tests/components/generic/test_camera.py        | 4 +++-
 tests/components/websocket_api/test_auth.py    | 2 +-
 tests/components/websocket_api/test_http.py    | 6 +++---
 7 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/homeassistant/components/websocket_api/http.py b/homeassistant/components/websocket_api/http.py
index 11aca19bab9..e7d57aebab6 100644
--- a/homeassistant/components/websocket_api/http.py
+++ b/homeassistant/components/websocket_api/http.py
@@ -330,13 +330,7 @@ class WebSocketHandler:
         if TYPE_CHECKING:
             assert writer is not None
 
-        # aiohttp 3.11.0 changed the method name from _send_frame to send_frame
-        if hasattr(writer, "send_frame"):
-            send_frame = writer.send_frame  # pragma: no cover
-        else:
-            send_frame = writer._send_frame  # noqa: SLF001
-
-        send_bytes_text = partial(send_frame, opcode=WSMsgType.TEXT)
+        send_bytes_text = partial(writer.send_frame, opcode=WSMsgType.TEXT)
         auth = AuthPhase(
             logger, hass, self._send_message, self._cancel, request, send_bytes_text
         )
diff --git a/homeassistant/package_constraints.txt b/homeassistant/package_constraints.txt
index 15ce798ab90..49d2f4f01cf 100644
--- a/homeassistant/package_constraints.txt
+++ b/homeassistant/package_constraints.txt
@@ -5,7 +5,7 @@ aiodiscover==2.1.0
 aiodns==3.2.0
 aiohasupervisor==0.2.1
 aiohttp-fast-zlib==0.1.1
-aiohttp==3.10.10
+aiohttp==3.11.0b3
 aiohttp_cors==0.7.0
 aiozoneinfo==0.2.1
 astral==2.2
diff --git a/pyproject.toml b/pyproject.toml
index 4a2857b5065..282a4e51ff7 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -28,7 +28,7 @@ dependencies    = [
     # change behavior based on presence of supervisor. Deprecated with #127228
     # Lib can be removed with 2025.11
     "aiohasupervisor==0.2.1",
-    "aiohttp==3.10.10",
+    "aiohttp==3.11.0b3",
     "aiohttp_cors==0.7.0",
     "aiohttp-fast-zlib==0.1.1",
     "aiozoneinfo==0.2.1",
diff --git a/requirements.txt b/requirements.txt
index a5beecec8ff..ef0a423467a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@
 # Home Assistant Core
 aiodns==3.2.0
 aiohasupervisor==0.2.1
-aiohttp==3.10.10
+aiohttp==3.11.0b3
 aiohttp_cors==0.7.0
 aiohttp-fast-zlib==0.1.1
 aiozoneinfo==0.2.1
diff --git a/tests/components/generic/test_camera.py b/tests/components/generic/test_camera.py
index 59ff513ccc9..d3ef0a39241 100644
--- a/tests/components/generic/test_camera.py
+++ b/tests/components/generic/test_camera.py
@@ -275,7 +275,9 @@ async def test_limit_refetch(
 
     with (
         pytest.raises(aiohttp.ServerTimeoutError),
-        patch("asyncio.timeout", side_effect=TimeoutError()),
+        patch.object(
+            client.session._connector, "connect", side_effect=asyncio.TimeoutError
+        ),
     ):
         resp = await client.get("/api/camera_proxy/camera.config_test")
 
diff --git a/tests/components/websocket_api/test_auth.py b/tests/components/websocket_api/test_auth.py
index 20a728cf3cd..d55d2f97017 100644
--- a/tests/components/websocket_api/test_auth.py
+++ b/tests/components/websocket_api/test_auth.py
@@ -293,6 +293,6 @@ async def test_auth_sending_unknown_type_disconnects(
         auth_msg = await ws.receive_json()
         assert auth_msg["type"] == TYPE_AUTH_REQUIRED
 
-        await ws._writer._send_frame(b"1" * 130, 0x30)
+        await ws._writer.send_frame(b"1" * 130, 0x30)
         auth_msg = await ws.receive()
         assert auth_msg.type == WSMsgType.close
diff --git a/tests/components/websocket_api/test_http.py b/tests/components/websocket_api/test_http.py
index 2530d885942..03e30c11ee9 100644
--- a/tests/components/websocket_api/test_http.py
+++ b/tests/components/websocket_api/test_http.py
@@ -5,7 +5,7 @@ from datetime import timedelta
 from typing import Any, cast
 from unittest.mock import patch
 
-from aiohttp import WSMsgType, WSServerHandshakeError, web
+from aiohttp import ServerDisconnectedError, WSMsgType, web
 import pytest
 
 from homeassistant.components.websocket_api import (
@@ -374,7 +374,7 @@ async def test_prepare_fail_timeout(
             "homeassistant.components.websocket_api.http.web.WebSocketResponse.prepare",
             side_effect=(TimeoutError, web.WebSocketResponse.prepare),
         ),
-        pytest.raises(WSServerHandshakeError),
+        pytest.raises(ServerDisconnectedError),
     ):
         await hass_ws_client(hass)
 
@@ -392,7 +392,7 @@ async def test_prepare_fail_connection_reset(
             "homeassistant.components.websocket_api.http.web.WebSocketResponse.prepare",
             side_effect=(ConnectionResetError, web.WebSocketResponse.prepare),
         ),
-        pytest.raises(WSServerHandshakeError),
+        pytest.raises(ServerDisconnectedError),
     ):
         await hass_ws_client(hass)