jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-20 11:47:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use short namespace for dr and er in config_entries (#131412)

Browse Source
This commit is contained in:
epenet 2024-11-24 00:12:40 +01:00 committed by GitHub
parent 0a8dde3740
commit 7ba3ce67f1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
homeassistant/config_entries.py
View File

@ -54,7 +54,12 @@ from .exceptions import (
ConfigEntryNotReady, ConfigEntryNotReady,
HomeAssistantError, HomeAssistantError,
) )
from .helpers import device_registry, entity_registry, issue_registry as ir, storage from .helpers import (
device_registry as dr,
entity_registry as er,
issue_registry as ir,
storage,
)
from .helpers.debounce import Debouncer from .helpers.debounce import Debouncer
from .helpers.discovery_flow import DiscoveryKey from .helpers.discovery_flow import DiscoveryKey
from .helpers.dispatcher import SignalType, async_dispatcher_send_internal from .helpers.dispatcher import SignalType, async_dispatcher_send_internal
@ -1948,8 +1953,8 @@ class ConfigEntries:
"""Clean up after an entry.""" """Clean up after an entry."""
entry_id = entry.entry_id entry_id = entry.entry_id
dev_reg = device_registry.async_get(self.hass) dev_reg = dr.async_get(self.hass)
ent_reg = entity_registry.async_get(self.hass) ent_reg = er.async_get(self.hass)
dev_reg.async_clear_config_entry(entry_id) dev_reg.async_clear_config_entry(entry_id)
ent_reg.async_clear_config_entry(entry_id) ent_reg.async_clear_config_entry(entry_id)
@ -2126,21 +2131,21 @@ class ConfigEntries:
entry.disabled_by = disabled_by entry.disabled_by = disabled_by
self._async_schedule_save() self._async_schedule_save()
dev_reg = device_registry.async_get(self.hass) dev_reg = dr.async_get(self.hass)
ent_reg = entity_registry.async_get(self.hass) ent_reg = er.async_get(self.hass)
if not entry.disabled_by: if not entry.disabled_by:
# The config entry will no longer be disabled, enable devices and entities # The config entry will no longer be disabled, enable devices and entities
device_registry.async_config_entry_disabled_by_changed(dev_reg, entry) dr.async_config_entry_disabled_by_changed(dev_reg, entry)
entity_registry.async_config_entry_disabled_by_changed(ent_reg, entry) er.async_config_entry_disabled_by_changed(ent_reg, entry)
# Load or unload the config entry # Load or unload the config entry
reload_result = await self.async_reload(entry_id) reload_result = await self.async_reload(entry_id)
if entry.disabled_by: if entry.disabled_by:
# The config entry has been disabled, disable devices and entities # The config entry has been disabled, disable devices and entities
device_registry.async_config_entry_disabled_by_changed(dev_reg, entry) dr.async_config_entry_disabled_by_changed(dev_reg, entry)
entity_registry.async_config_entry_disabled_by_changed(ent_reg, entry) er.async_config_entry_disabled_by_changed(ent_reg, entry)
return reload_result return reload_result
@ -3182,7 +3187,7 @@ class EntityRegistryDisabledHandler:
def __init__(self, hass: HomeAssistant) -> None: def __init__(self, hass: HomeAssistant) -> None:
"""Initialize the handler.""" """Initialize the handler."""
self.hass = hass self.hass = hass
self.registry: entity_registry.EntityRegistry | None = None self.registry: er.EntityRegistry | None = None
self.changed: set[str] = set() self.changed: set[str] = set()
self._remove_call_later: Callable[[], None] | None = None self._remove_call_later: Callable[[], None] | None = None
@ -3190,18 +3195,18 @@ class EntityRegistryDisabledHandler:
def async_setup(self) -> None: def async_setup(self) -> None:
"""Set up the disable handler.""" """Set up the disable handler."""
self.hass.bus.async_listen( self.hass.bus.async_listen(
entity_registry.EVENT_ENTITY_REGISTRY_UPDATED, er.EVENT_ENTITY_REGISTRY_UPDATED,
self._handle_entry_updated, self._handle_entry_updated,
event_filter=_handle_entry_updated_filter, event_filter=_handle_entry_updated_filter,
) )
@callback @callback
def _handle_entry_updated( def _handle_entry_updated(
self, event: Event[entity_registry.EventEntityRegistryUpdatedData] self, event: Event[er.EventEntityRegistryUpdatedData]
) -> None: ) -> None:
"""Handle entity registry entry update.""" """Handle entity registry entry update."""
if self.registry is None: if self.registry is None:
self.registry = entity_registry.async_get(self.hass) self.registry = er.async_get(self.hass)
entity_entry = self.registry.async_get(event.data["entity_id"]) entity_entry = self.registry.async_get(event.data["entity_id"])
@ -3258,7 +3263,7 @@ class EntityRegistryDisabledHandler:
@callback @callback
def _handle_entry_updated_filter( def _handle_entry_updated_filter(
event_data: entity_registry.EventEntityRegistryUpdatedData, event_data: er.EventEntityRegistryUpdatedData,
) -> bool: ) -> bool:
"""Handle entity registry entry update filter. """Handle entity registry entry update filter.
@ -3268,8 +3273,7 @@ def _handle_entry_updated_filter(
return not ( return not (
event_data["action"] != "update" event_data["action"] != "update"
or "disabled_by" not in event_data["changes"] or "disabled_by" not in event_data["changes"]
or event_data["changes"]["disabled_by"] or event_data["changes"]["disabled_by"] is er.RegistryEntryDisabler.CONFIG_ENTRY
is entity_registry.RegistryEntryDisabler.CONFIG_ENTRY
) )