Bump aiohttp to 3.10.0b1 (#122409)

homeassistant/components/http/__init__.py

@@ -22,7 +22,6 @@
 from aiohttp.typedefs import JSONDecoder, StrOrURL
 from aiohttp.web_exceptions import HTTPMovedPermanently, HTTPRedirection
 from aiohttp.web_protocol import RequestHandler
-from aiohttp_fast_url_dispatcher import FastUrlDispatcher, attach_fast_url_dispatcher
 from cryptography import x509
 from cryptography.hazmat.primitives import hashes, serialization
 from cryptography.hazmat.primitives.asymmetric import rsa
@@ -335,10 +334,6 @@ def __init__(
                 "max_field_size": MAX_LINE_SIZE,
             },
         )
-        # By default aiohttp does a linear search for routing rules,
-        # we have a lot of routes, so use a dict lookup with a fallback
-        # to the linear search.
-        attach_fast_url_dispatcher(self.app, FastUrlDispatcher())
         self.hass = hass
         self.ssl_certificate = ssl_certificate
         self.ssl_peer_certificate = ssl_peer_certificate

homeassistant/helpers/aiohttp_client.py

@@ -14,6 +14,7 @@
 import aiohttp
 from aiohttp import web
 from aiohttp.hdrs import CONTENT_TYPE, USER_AGENT
+from aiohttp.resolver import AsyncResolver
 from aiohttp.web_exceptions import HTTPBadGateway, HTTPGatewayTimeout
 
 from homeassistant import config_entries
@@ -24,7 +25,6 @@
 from homeassistant.util.hass_dict import HassKey
 from homeassistant.util.json import json_loads
 
-from .backports.aiohttp_resolver import AsyncResolver
 from .frame import warn_use
 from .json import json_dumps
 

homeassistant/package_constraints.txt

@@ -3,9 +3,8 @@
 aiodhcpwatcher==1.0.2
 aiodiscover==2.1.0
 aiodns==3.2.0
-aiohttp-fast-url-dispatcher==0.3.0
 aiohttp-fast-zlib==0.1.1
-aiohttp==3.9.5
+aiohttp==3.10.0b1
 aiohttp_cors==0.7.0
 aiozoneinfo==0.2.1
 astral==2.2

pyproject.toml

@@ -24,9 +24,8 @@ classifiers = [
 requires-python = ">=3.12.0"
 dependencies    = [
     "aiodns==3.2.0",
-    "aiohttp==3.9.5",
+    "aiohttp==3.10.0b1",
     "aiohttp_cors==0.7.0",
-    "aiohttp-fast-url-dispatcher==0.3.0",
     "aiohttp-fast-zlib==0.1.1",
     "aiozoneinfo==0.2.1",
     "astral==2.2",

requirements.txt

@@ -4,9 +4,8 @@
 
 # Home Assistant Core
 aiodns==3.2.0
-aiohttp==3.9.5
+aiohttp==3.10.0b1
 aiohttp_cors==0.7.0
-aiohttp-fast-url-dispatcher==0.3.0
 aiohttp-fast-zlib==0.1.1
 aiozoneinfo==0.2.1
 astral==2.2

script/licenses.py

@@ -125,7 +125,6 @@ def from_dict(cls, data: dict[str, str]) -> PackageDefinition:
     "aiocomelit",  # https://github.com/chemelli74/aiocomelit/pull/138
     "aioecowitt",  # https://github.com/home-assistant-libs/aioecowitt/pull/180
     "aiohappyeyeballs",  # PSF-2.0 license
-    "aiohttp-fast-url-dispatcher",  # https://github.com/bdraco/aiohttp-fast-url-dispatcher/pull/10
     "aioopenexchangerates",  # https://github.com/MartinHjelmare/aioopenexchangerates/pull/94
     "aiooui",  # https://github.com/Bluetooth-Devices/aiooui/pull/8
     "aioruuvigateway",  # https://github.com/akx/aioruuvigateway/pull/6

tests/components/websocket_api/test_http.py

@@ -5,7 +5,7 @@
 from typing import Any, cast
 from unittest.mock import patch
 
-from aiohttp import ServerDisconnectedError, WSMsgType, web
+from aiohttp import WSMsgType, WSServerHandshakeError, web
 import pytest
 
 from homeassistant.components.websocket_api import (
@@ -374,7 +374,7 @@ async def test_prepare_fail(
             "homeassistant.components.websocket_api.http.web.WebSocketResponse.prepare",
             side_effect=(TimeoutError, web.WebSocketResponse.prepare),
         ),
-        pytest.raises(ServerDisconnectedError),
+        pytest.raises(WSServerHandshakeError),
     ):
         await hass_ws_client(hass)