diff --git a/esphome/components/web_server/__init__.py b/esphome/components/web_server/__init__.py index 44af972140..3b10583acd 100644 --- a/esphome/components/web_server/__init__.py +++ b/esphome/components/web_server/__init__.py @@ -338,7 +338,7 @@ async def to_code(config): if config[CONF_COMPRESSION] == "gzip": cg.add_define("USE_WEBSERVER_GZIP") - # Extract domains from CDN URLs for DNS whitelisting (used by captive_portal) + # Extract domains from CDN URLs for DNS allowlisting (used by captive_portal) # This handles both default URLs (using CDN_HOST) and custom user URLs cdn_domains: set[str] = set() for url_key in (CONF_CSS_URL, CONF_JS_URL): diff --git a/esphome/coroutine.py b/esphome/coroutine.py index 63a6ad338d..8929e9f48b 100644 --- a/esphome/coroutine.py +++ b/esphome/coroutine.py @@ -67,14 +67,14 @@ class CoroPriority(enum.IntEnum): # Examples: esp32, esp8266, rp2040 PLATFORM = 1000 - # Network infrastructure setup - must run after CORE which adds 'using namespace esphome;' - # Examples: network (99) - NETWORK = 99 - # Network transport layer # Examples: async_tcp (200) NETWORK_TRANSPORT = 200 + # Network infrastructure setup - must run after CORE which adds 'using namespace esphome;' + # Examples: network (99) + NETWORK = 99 + # Core system components # Examples: esphome core, most entity base components (cover, update, datetime, # valve, alarm_control_panel, lock, event, binary_sensor, button, climate, fan, diff --git a/tests/unit_tests/test_coroutine.py b/tests/unit_tests/test_coroutine.py index e12c273294..10d833c579 100644 --- a/tests/unit_tests/test_coroutine.py +++ b/tests/unit_tests/test_coroutine.py @@ -8,9 +8,9 @@ from esphome.coroutine import CoroPriority, FakeEventLoop, coroutine_with_priori def test_coro_priority_enum_values() -> None: """Test that CoroPriority enum values match expected priorities.""" assert CoroPriority.PLATFORM == 1000 - assert CoroPriority.NETWORK == 201 assert CoroPriority.NETWORK_TRANSPORT == 200 assert CoroPriority.CORE == 100 + assert CoroPriority.NETWORK == 99 assert CoroPriority.DIAGNOSTICS == 90 assert CoroPriority.STATUS == 80 assert CoroPriority.WEB_SERVER_BASE == 65 @@ -70,9 +70,9 @@ def test_float_and_enum_are_interchangeable() -> None: ("enum_value", "float_value"), [ (CoroPriority.PLATFORM, 1000.0), - (CoroPriority.NETWORK, 201.0), (CoroPriority.NETWORK_TRANSPORT, 200.0), (CoroPriority.CORE, 100.0), + (CoroPriority.NETWORK, 99.0), (CoroPriority.DIAGNOSTICS, 90.0), (CoroPriority.STATUS, 80.0), (CoroPriority.WEB_SERVER_BASE, 65.0), @@ -169,10 +169,10 @@ def test_mixed_float_and_enum_priorities() -> None: def test_enum_priority_comparison() -> None: """Test that enum priorities can be compared directly.""" - assert CoroPriority.PLATFORM > CoroPriority.NETWORK - assert CoroPriority.NETWORK > CoroPriority.NETWORK_TRANSPORT + assert CoroPriority.PLATFORM > CoroPriority.NETWORK_TRANSPORT assert CoroPriority.NETWORK_TRANSPORT > CoroPriority.CORE - assert CoroPriority.CORE > CoroPriority.DIAGNOSTICS + assert CoroPriority.CORE > CoroPriority.NETWORK + assert CoroPriority.NETWORK > CoroPriority.DIAGNOSTICS assert CoroPriority.DIAGNOSTICS > CoroPriority.STATUS assert CoroPriority.STATUS > CoroPriority.WEB_SERVER_BASE assert CoroPriority.WEB_SERVER_BASE > CoroPriority.CAPTIVE_PORTAL