Drop alias from local DOMAIN import (#144311)

homeassistant/components/bmw_connected_drive/button.py

@@ -16,7 +16,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import DOMAIN as BMW_DOMAIN, BMWConfigEntry
+from . import DOMAIN, BMWConfigEntry
 from .entity import BMWBaseEntity
 
 if TYPE_CHECKING:
@@ -111,7 +111,7 @@ class BMWButton(BMWBaseEntity, ButtonEntity):
             await self.entity_description.remote_function(self.vehicle)
         except MyBMWAPIError as ex:
             raise HomeAssistantError(
-                translation_domain=BMW_DOMAIN,
+                translation_domain=DOMAIN,
                 translation_key="remote_service_error",
                 translation_placeholders={"exception": str(ex)},
             ) from ex

homeassistant/components/bmw_connected_drive/lock.py

@@ -14,7 +14,7 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import DOMAIN as BMW_DOMAIN, BMWConfigEntry
+from . import DOMAIN, BMWConfigEntry
 from .coordinator import BMWDataUpdateCoordinator
 from .entity import BMWBaseEntity
 
@@ -71,7 +71,7 @@ class BMWLock(BMWBaseEntity, LockEntity):
             self._attr_is_locked = None
             self.async_write_ha_state()
             raise HomeAssistantError(
-                translation_domain=BMW_DOMAIN,
+                translation_domain=DOMAIN,
                 translation_key="remote_service_error",
                 translation_placeholders={"exception": str(ex)},
             ) from ex
@@ -95,7 +95,7 @@ class BMWLock(BMWBaseEntity, LockEntity):
             self._attr_is_locked = None
             self.async_write_ha_state()
             raise HomeAssistantError(
-                translation_domain=BMW_DOMAIN,
+                translation_domain=DOMAIN,
                 translation_key="remote_service_error",
                 translation_placeholders={"exception": str(ex)},
             ) from ex

homeassistant/components/bmw_connected_drive/notify.py

@@ -20,7 +20,7 @@ from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
-from . import DOMAIN as BMW_DOMAIN, BMWConfigEntry
+from . import DOMAIN, BMWConfigEntry
 
 PARALLEL_UPDATES = 1
 
@@ -92,7 +92,7 @@ class BMWNotificationService(BaseNotificationService):
 
         except (vol.Invalid, TypeError, ValueError) as ex:
             raise ServiceValidationError(
-                translation_domain=BMW_DOMAIN,
+                translation_domain=DOMAIN,
                 translation_key="invalid_poi",
                 translation_placeholders={
                     "poi_exception": str(ex),
@@ -107,7 +107,7 @@ class BMWNotificationService(BaseNotificationService):
                 await vehicle.remote_services.trigger_send_poi(poi)
             except MyBMWAPIError as ex:
                 raise HomeAssistantError(
-                    translation_domain=BMW_DOMAIN,
+                    translation_domain=DOMAIN,
                     translation_key="remote_service_error",
                     translation_placeholders={"exception": str(ex)},
                 ) from ex

homeassistant/components/bmw_connected_drive/number.py

@@ -18,7 +18,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import DOMAIN as BMW_DOMAIN, BMWConfigEntry
+from . import DOMAIN, BMWConfigEntry
 from .coordinator import BMWDataUpdateCoordinator
 from .entity import BMWBaseEntity
 
@@ -110,7 +110,7 @@ class BMWNumber(BMWBaseEntity, NumberEntity):
             await self.entity_description.remote_service(self.vehicle, value)
         except MyBMWAPIError as ex:
             raise HomeAssistantError(
-                translation_domain=BMW_DOMAIN,
+                translation_domain=DOMAIN,
                 translation_key="remote_service_error",
                 translation_placeholders={"exception": str(ex)},
             ) from ex

homeassistant/components/bmw_connected_drive/select.py

@@ -15,7 +15,7 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import DOMAIN as BMW_DOMAIN, BMWConfigEntry
+from . import DOMAIN, BMWConfigEntry
 from .coordinator import BMWDataUpdateCoordinator
 from .entity import BMWBaseEntity
 
@@ -124,7 +124,7 @@ class BMWSelect(BMWBaseEntity, SelectEntity):
             await self.entity_description.remote_service(self.vehicle, option)
         except MyBMWAPIError as ex:
             raise HomeAssistantError(
-                translation_domain=BMW_DOMAIN,
+                translation_domain=DOMAIN,
                 translation_key="remote_service_error",
                 translation_placeholders={"exception": str(ex)},
             ) from ex

homeassistant/components/bmw_connected_drive/switch.py

@@ -14,7 +14,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import DOMAIN as BMW_DOMAIN, BMWConfigEntry
+from . import DOMAIN, BMWConfigEntry
 from .coordinator import BMWDataUpdateCoordinator
 from .entity import BMWBaseEntity
 
@@ -112,7 +112,7 @@ class BMWSwitch(BMWBaseEntity, SwitchEntity):
             await self.entity_description.remote_service_on(self.vehicle)
         except MyBMWAPIError as ex:
             raise HomeAssistantError(
-                translation_domain=BMW_DOMAIN,
+                translation_domain=DOMAIN,
                 translation_key="remote_service_error",
                 translation_placeholders={"exception": str(ex)},
             ) from ex
@@ -124,7 +124,7 @@ class BMWSwitch(BMWBaseEntity, SwitchEntity):
             await self.entity_description.remote_service_off(self.vehicle)
         except MyBMWAPIError as ex:
             raise HomeAssistantError(
-                translation_domain=BMW_DOMAIN,
+                translation_domain=DOMAIN,
                 translation_key="remote_service_error",
                 translation_placeholders={"exception": str(ex)},
             ) from ex

homeassistant/components/danfoss_air/binary_sensor.py

@@ -12,7 +12,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
-from . import DOMAIN as DANFOSS_AIR_DOMAIN
+from . import DOMAIN
 
 
 def setup_platform(
@@ -22,7 +22,7 @@ def setup_platform(
     discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
     """Set up the available Danfoss Air sensors etc."""
-    data = hass.data[DANFOSS_AIR_DOMAIN]
+    data = hass.data[DOMAIN]
 
     sensors = [
         [

homeassistant/components/danfoss_air/sensor.py

@@ -16,7 +16,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
-from . import DOMAIN as DANFOSS_AIR_DOMAIN
+from . import DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -28,7 +28,7 @@ def setup_platform(
     discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
     """Set up the available Danfoss Air sensors etc."""
-    data = hass.data[DANFOSS_AIR_DOMAIN]
+    data = hass.data[DOMAIN]
 
     sensors = [
         [

homeassistant/components/danfoss_air/switch.py

@@ -12,7 +12,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
-from . import DOMAIN as DANFOSS_AIR_DOMAIN
+from . import DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -24,7 +24,7 @@ def setup_platform(
     discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
     """Set up the Danfoss Air HRV switch platform."""
-    data = hass.data[DANFOSS_AIR_DOMAIN]
+    data = hass.data[DOMAIN]
 
     switches = [
         [

homeassistant/components/dovado/notify.py

@@ -8,7 +8,7 @@ from homeassistant.components.notify import ATTR_TARGET, BaseNotificationService
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
-from . import DOMAIN as DOVADO_DOMAIN
+from . import DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -19,7 +19,7 @@ def get_service(
     discovery_info: DiscoveryInfoType | None = None,
 ) -> DovadoSMSNotificationService:
     """Get the Dovado Router SMS notification service."""
-    return DovadoSMSNotificationService(hass.data[DOVADO_DOMAIN].client)
+    return DovadoSMSNotificationService(hass.data[DOMAIN].client)
 
 
 class DovadoSMSNotificationService(BaseNotificationService):

homeassistant/components/dovado/sensor.py

@@ -20,7 +20,7 @@ from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
-from . import DOMAIN as DOVADO_DOMAIN
+from . import DOMAIN
 
 MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=30)
 
@@ -90,7 +90,7 @@ def setup_platform(
     discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
     """Set up the Dovado sensor platform."""
-    dovado = hass.data[DOVADO_DOMAIN]
+    dovado = hass.data[DOMAIN]
 
     sensors = config[CONF_SENSORS]
     entities = [

homeassistant/components/geofency/device_tracker.py

@@ -10,7 +10,7 @@ from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 
-from . import DOMAIN as GF_DOMAIN, TRACKER_UPDATE
+from . import DOMAIN, TRACKER_UPDATE
 
 
 async def async_setup_entry(
@@ -23,14 +23,14 @@ async def async_setup_entry(
     @callback
     def _receive_data(device, gps, location_name, attributes):
         """Fire HA event to set location."""
-        if device in hass.data[GF_DOMAIN]["devices"]:
+        if device in hass.data[DOMAIN]["devices"]:
             return
 
-        hass.data[GF_DOMAIN]["devices"].add(device)
+        hass.data[DOMAIN]["devices"].add(device)
 
         async_add_entities([GeofencyEntity(device, gps, location_name, attributes)])
 
-    hass.data[GF_DOMAIN]["unsub_device_tracker"][config_entry.entry_id] = (
+    hass.data[DOMAIN]["unsub_device_tracker"][config_entry.entry_id] = (
         async_dispatcher_connect(hass, TRACKER_UPDATE, _receive_data)
     )
 
@@ -45,7 +45,7 @@ async def async_setup_entry(
     }
 
     if dev_ids:
-        hass.data[GF_DOMAIN]["devices"].update(dev_ids)
+        hass.data[DOMAIN]["devices"].update(dev_ids)
         async_add_entities(GeofencyEntity(dev_id) for dev_id in dev_ids)
 
 
@@ -66,7 +66,7 @@ class GeofencyEntity(TrackerEntity, RestoreEntity):
         self._unsub_dispatcher = None
         self._attr_unique_id = device
         self._attr_device_info = DeviceInfo(
-            identifiers={(GF_DOMAIN, device)},
+            identifiers={(DOMAIN, device)},
             name=device,
         )
 
@@ -93,7 +93,7 @@ class GeofencyEntity(TrackerEntity, RestoreEntity):
         """Clean up after entity before removal."""
         await super().async_will_remove_from_hass()
         self._unsub_dispatcher()
-        self.hass.data[GF_DOMAIN]["devices"].remove(self.unique_id)
+        self.hass.data[DOMAIN]["devices"].remove(self.unique_id)
 
     @callback
     def _async_receive_data(self, device, gps, location_name, attributes):

homeassistant/components/gpslogger/device_tracker.py

@@ -15,7 +15,7 @@ from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 
-from . import DOMAIN as GPL_DOMAIN, TRACKER_UPDATE
+from . import DOMAIN, TRACKER_UPDATE
 from .const import (
     ATTR_ACTIVITY,
     ATTR_ALTITUDE,
@@ -35,14 +35,14 @@ async def async_setup_entry(
     @callback
     def _receive_data(device, gps, battery, accuracy, attrs):
         """Receive set location."""
-        if device in hass.data[GPL_DOMAIN]["devices"]:
+        if device in hass.data[DOMAIN]["devices"]:
             return
 
-        hass.data[GPL_DOMAIN]["devices"].add(device)
+        hass.data[DOMAIN]["devices"].add(device)
 
         async_add_entities([GPSLoggerEntity(device, gps, battery, accuracy, attrs)])
 
-    hass.data[GPL_DOMAIN]["unsub_device_tracker"][entry.entry_id] = (
+    hass.data[DOMAIN]["unsub_device_tracker"][entry.entry_id] = (
         async_dispatcher_connect(hass, TRACKER_UPDATE, _receive_data)
     )
 
@@ -58,7 +58,7 @@ async def async_setup_entry(
 
     entities = []
     for dev_id in dev_ids:
-        hass.data[GPL_DOMAIN]["devices"].add(dev_id)
+        hass.data[DOMAIN]["devices"].add(dev_id)
         entity = GPSLoggerEntity(dev_id, None, None, None, None)
         entities.append(entity)
 
@@ -83,7 +83,7 @@ class GPSLoggerEntity(TrackerEntity, RestoreEntity):
         self._unsub_dispatcher = None
         self._attr_unique_id = device
         self._attr_device_info = DeviceInfo(
-            identifiers={(GPL_DOMAIN, device)},
+            identifiers={(DOMAIN, device)},
             name=device,
         )
 

homeassistant/components/iperf3/sensor.py

@@ -10,7 +10,7 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
-from . import ATTR_VERSION, DATA_UPDATED, DOMAIN as IPERF3_DOMAIN, SENSOR_TYPES
+from . import ATTR_VERSION, DATA_UPDATED, DOMAIN, SENSOR_TYPES
 
 ATTR_PROTOCOL = "Protocol"
 ATTR_REMOTE_HOST = "Remote Server"
@@ -29,7 +29,7 @@ async def async_setup_platform(
 
     entities = [
         Iperf3Sensor(iperf3_host, description)
-        for iperf3_host in hass.data[IPERF3_DOMAIN].values()
+        for iperf3_host in hass.data[DOMAIN].values()
         for description in SENSOR_TYPES
         if description.key in discovery_info[CONF_MONITORED_CONDITIONS]
     ]

homeassistant/components/locative/device_tracker.py

@@ -6,7 +6,7 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import DOMAIN as LT_DOMAIN, TRACKER_UPDATE
+from . import DOMAIN, TRACKER_UPDATE
 
 
 async def async_setup_entry(
@@ -19,14 +19,14 @@ async def async_setup_entry(
     @callback
     def _receive_data(device, location, location_name):
         """Receive set location."""
-        if device in hass.data[LT_DOMAIN]["devices"]:
+        if device in hass.data[DOMAIN]["devices"]:
             return
 
-        hass.data[LT_DOMAIN]["devices"].add(device)
+        hass.data[DOMAIN]["devices"].add(device)
 
         async_add_entities([LocativeEntity(device, location, location_name)])
 
-    hass.data[LT_DOMAIN]["unsub_device_tracker"][entry.entry_id] = (
+    hass.data[DOMAIN]["unsub_device_tracker"][entry.entry_id] = (
         async_dispatcher_connect(hass, TRACKER_UPDATE, _receive_data)
     )
 

homeassistant/components/lutron_caseta/binary_sensor.py

@@ -11,7 +11,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import DOMAIN as CASETA_DOMAIN
+from . import DOMAIN
 from .const import CONFIG_URL, MANUFACTURER, UNASSIGNED_AREA
 from .entity import LutronCasetaEntity
 from .models import LutronCasetaConfigEntry
@@ -49,11 +49,11 @@ class LutronOccupancySensor(LutronCasetaEntity, BinarySensorEntity):
         name = f"{area} {device['device_name']}"
         self._attr_name = name
         self._attr_device_info = DeviceInfo(
-            identifiers={(CASETA_DOMAIN, self.unique_id)},
+            identifiers={(DOMAIN, self.unique_id)},
             manufacturer=MANUFACTURER,
             model="Lutron Occupancy",
             name=self.name,
-            via_device=(CASETA_DOMAIN, self._bridge_device["serial"]),
+            via_device=(DOMAIN, self._bridge_device["serial"]),
             configuration_url=CONFIG_URL,
             entry_type=DeviceEntryType.SERVICE,
         )

homeassistant/components/mailgun/notify.py

@@ -23,7 +23,7 @@ from homeassistant.const import CONF_API_KEY, CONF_DOMAIN, CONF_RECIPIENT, CONF_
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
-from . import CONF_SANDBOX, DOMAIN as MAILGUN_DOMAIN
+from . import CONF_SANDBOX, DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -43,7 +43,7 @@ def get_service(
     discovery_info: DiscoveryInfoType | None = None,
 ) -> MailgunNotificationService | None:
     """Get the Mailgun notification service."""
-    data = hass.data[MAILGUN_DOMAIN]
+    data = hass.data[DOMAIN]
     mailgun_service = MailgunNotificationService(
         data.get(CONF_DOMAIN),
         data.get(CONF_SANDBOX),

homeassistant/components/owntracks/device_tracker.py

@@ -19,7 +19,7 @@ from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 
-from . import DOMAIN as OT_DOMAIN
+from . import DOMAIN
 
 
 async def async_setup_entry(
@@ -38,22 +38,22 @@ async def async_setup_entry(
 
     entities = []
     for dev_id in dev_ids:
-        entity = hass.data[OT_DOMAIN]["devices"][dev_id] = OwnTracksEntity(dev_id)
+        entity = hass.data[DOMAIN]["devices"][dev_id] = OwnTracksEntity(dev_id)
         entities.append(entity)
 
     @callback
     def _receive_data(dev_id, **data):
         """Receive set location."""
-        entity = hass.data[OT_DOMAIN]["devices"].get(dev_id)
+        entity = hass.data[DOMAIN]["devices"].get(dev_id)
 
         if entity is not None:
             entity.update_data(data)
             return
 
-        entity = hass.data[OT_DOMAIN]["devices"][dev_id] = OwnTracksEntity(dev_id, data)
+        entity = hass.data[DOMAIN]["devices"][dev_id] = OwnTracksEntity(dev_id, data)
         async_add_entities([entity])
 
-    hass.data[OT_DOMAIN]["context"].set_async_see(_receive_data)
+    hass.data[DOMAIN]["context"].set_async_see(_receive_data)
 
     async_add_entities(entities)
 
@@ -121,7 +121,7 @@ class OwnTracksEntity(TrackerEntity, RestoreEntity):
     @property
     def device_info(self) -> DeviceInfo:
         """Return the device info."""
-        device_info = DeviceInfo(identifiers={(OT_DOMAIN, self._dev_id)})
+        device_info = DeviceInfo(identifiers={(DOMAIN, self._dev_id)})
         if "host_name" in self._data:
             device_info["name"] = self._data["host_name"]
         return device_info

homeassistant/components/qwikswitch/binary_sensor.py

@@ -11,7 +11,7 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
-from . import DOMAIN as QWIKSWITCH
+from . import DOMAIN
 from .entity import QSEntity
 
 _LOGGER = logging.getLogger(__name__)
@@ -27,9 +27,9 @@ async def async_setup_platform(
     if discovery_info is None:
         return
 
-    qsusb = hass.data[QWIKSWITCH]
+    qsusb = hass.data[DOMAIN]
     _LOGGER.debug("Setup qwikswitch.binary_sensor %s, %s", qsusb, discovery_info)
-    devs = [QSBinarySensor(sensor) for sensor in discovery_info[QWIKSWITCH]]
+    devs = [QSBinarySensor(sensor) for sensor in discovery_info[DOMAIN]]
     add_entities(devs)
 
 

homeassistant/components/qwikswitch/light.py

@@ -7,7 +7,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
-from . import DOMAIN as QWIKSWITCH
+from . import DOMAIN
 from .entity import QSToggleEntity
 
 
@@ -21,8 +21,8 @@ async def async_setup_platform(
     if discovery_info is None:
         return
 
-    qsusb = hass.data[QWIKSWITCH]
+    qsusb = hass.data[DOMAIN]
-    devs = [QSLight(qsid, qsusb) for qsid in discovery_info[QWIKSWITCH]]
+    devs = [QSLight(qsid, qsusb) for qsid in discovery_info[DOMAIN]]
     add_entities(devs)
 
 

homeassistant/components/qwikswitch/sensor.py

@@ -12,7 +12,7 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
-from . import DOMAIN as QWIKSWITCH
+from . import DOMAIN
 from .entity import QSEntity
 
 _LOGGER = logging.getLogger(__name__)
@@ -28,9 +28,9 @@ async def async_setup_platform(
     if discovery_info is None:
         return
 
-    qsusb = hass.data[QWIKSWITCH]
+    qsusb = hass.data[DOMAIN]
     _LOGGER.debug("Setup qwikswitch.sensor %s, %s", qsusb, discovery_info)
-    devs = [QSSensor(sensor) for sensor in discovery_info[QWIKSWITCH]]
+    devs = [QSSensor(sensor) for sensor in discovery_info[DOMAIN]]
     add_entities(devs)
 
 

homeassistant/components/qwikswitch/switch.py

@@ -7,7 +7,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
-from . import DOMAIN as QWIKSWITCH
+from . import DOMAIN
 from .entity import QSToggleEntity
 
 
@@ -21,8 +21,8 @@ async def async_setup_platform(
     if discovery_info is None:
         return
 
-    qsusb = hass.data[QWIKSWITCH]
+    qsusb = hass.data[DOMAIN]
-    devs = [QSSwitch(qsid, qsusb) for qsid in discovery_info[QWIKSWITCH]]
+    devs = [QSSwitch(qsid, qsusb) for qsid in discovery_info[DOMAIN]]
     add_entities(devs)
 
 

homeassistant/components/tibber/notify.py

@@ -14,7 +14,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import DOMAIN as TIBBER_DOMAIN
+from . import DOMAIN
 
 
 async def async_setup_entry(
@@ -30,7 +30,7 @@ class TibberNotificationEntity(NotifyEntity):
     """Implement the notification entity service for Tibber."""
 
     _attr_supported_features = NotifyEntityFeature.TITLE
-    _attr_name = TIBBER_DOMAIN
+    _attr_name = DOMAIN
     _attr_icon = "mdi:message-flash"
 
     def __init__(self, unique_id: str) -> None:
@@ -39,12 +39,12 @@ class TibberNotificationEntity(NotifyEntity):
 
     async def async_send_message(self, message: str, title: str | None = None) -> None:
         """Send a message to Tibber devices."""
-        tibber_connection: Tibber = self.hass.data[TIBBER_DOMAIN]
+        tibber_connection: Tibber = self.hass.data[DOMAIN]
         try:
             await tibber_connection.send_notification(
                 title or ATTR_TITLE_DEFAULT, message
             )
         except TimeoutError as exc:
             raise HomeAssistantError(
-                translation_domain=TIBBER_DOMAIN, translation_key="send_message_timeout"
+                translation_domain=DOMAIN, translation_key="send_message_timeout"
             ) from exc

homeassistant/components/waterfurnace/sensor.py

@@ -15,7 +15,7 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import slugify
 
-from . import DOMAIN as WF_DOMAIN, UPDATE_TOPIC, WaterFurnaceData
+from . import DOMAIN, UPDATE_TOPIC, WaterFurnaceData
 
 SENSORS = [
     SensorEntityDescription(name="Furnace Mode", key="mode", icon="mdi:gauge"),
@@ -104,7 +104,7 @@ def setup_platform(
     if discovery_info is None:
         return
 
-    client = hass.data[WF_DOMAIN]
+    client = hass.data[DOMAIN]
 
     add_entities(WaterFurnaceSensor(client, description) for description in SENSORS)
 

homeassistant/components/xs1/climate.py

@@ -16,7 +16,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
-from . import ACTUATORS, DOMAIN as COMPONENT_DOMAIN, SENSORS
+from . import ACTUATORS, DOMAIN, SENSORS
 from .entity import XS1DeviceEntity
 
 MIN_TEMP = 8
@@ -30,8 +30,8 @@ def setup_platform(
     discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
     """Set up the XS1 thermostat platform."""
-    actuators = hass.data[COMPONENT_DOMAIN][ACTUATORS]
+    actuators = hass.data[DOMAIN][ACTUATORS]
-    sensors = hass.data[COMPONENT_DOMAIN][SENSORS]
+    sensors = hass.data[DOMAIN][SENSORS]
 
     thermostat_entities = []
     for actuator in actuators:

homeassistant/components/xs1/sensor.py

@@ -9,7 +9,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
-from . import ACTUATORS, DOMAIN as COMPONENT_DOMAIN, SENSORS
+from . import ACTUATORS, DOMAIN, SENSORS
 from .entity import XS1DeviceEntity
 
 
@@ -20,8 +20,8 @@ def setup_platform(
     discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
     """Set up the XS1 sensor platform."""
-    sensors = hass.data[COMPONENT_DOMAIN][SENSORS]
+    sensors = hass.data[DOMAIN][SENSORS]
-    actuators = hass.data[COMPONENT_DOMAIN][ACTUATORS]
+    actuators = hass.data[DOMAIN][ACTUATORS]
 
     sensor_entities = []
     for sensor in sensors:

homeassistant/components/xs1/switch.py

@@ -11,7 +11,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
-from . import ACTUATORS, DOMAIN as COMPONENT_DOMAIN
+from . import ACTUATORS, DOMAIN
 from .entity import XS1DeviceEntity
 
 
@@ -22,7 +22,7 @@ def setup_platform(
     discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
     """Set up the XS1 switch platform."""
-    actuators = hass.data[COMPONENT_DOMAIN][ACTUATORS]
+    actuators = hass.data[DOMAIN][ACTUATORS]
 
     add_entities(
         XS1SwitchEntity(actuator)

homeassistant/components/zoneminder/binary_sensor.py

@@ -12,7 +12,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
-from . import DOMAIN as ZONEMINDER_DOMAIN
+from . import DOMAIN
 
 
 async def async_setup_platform(
@@ -23,7 +23,7 @@ async def async_setup_platform(
 ) -> None:
     """Set up the ZoneMinder binary sensor platform."""
     sensors = []
-    for host_name, zm_client in hass.data[ZONEMINDER_DOMAIN].items():
+    for host_name, zm_client in hass.data[DOMAIN].items():
         sensors.append(ZMAvailabilitySensor(host_name, zm_client))
     add_entities(sensors)
 

homeassistant/components/zoneminder/camera.py

@@ -13,7 +13,7 @@ from homeassistant.exceptions import PlatformNotReady
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
-from . import DOMAIN as ZONEMINDER_DOMAIN
+from . import DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -28,7 +28,7 @@ def setup_platform(
     filter_urllib3_logging()
     cameras = []
     zm_client: ZoneMinder
-    for zm_client in hass.data[ZONEMINDER_DOMAIN].values():
+    for zm_client in hass.data[DOMAIN].values():
         if not (monitors := zm_client.get_monitors()):
             raise PlatformNotReady(
                 "Camera could not fetch any monitors from ZoneMinder"

homeassistant/components/zoneminder/sensor.py

@@ -20,7 +20,7 @@ from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
-from . import DOMAIN as ZONEMINDER_DOMAIN
+from . import DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -77,7 +77,7 @@ def setup_platform(
 
     sensors: list[SensorEntity] = []
     zm_client: ZoneMinder
-    for zm_client in hass.data[ZONEMINDER_DOMAIN].values():
+    for zm_client in hass.data[DOMAIN].values():
         if not (monitors := zm_client.get_monitors()):
             raise PlatformNotReady(
                 "Sensor could not fetch any monitors from ZoneMinder"

homeassistant/components/zoneminder/switch.py

@@ -20,7 +20,7 @@ from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
-from . import DOMAIN as ZONEMINDER_DOMAIN
+from . import DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -45,7 +45,7 @@ def setup_platform(
 
     switches: list[ZMSwitchMonitors] = []
     zm_client: ZoneMinder
-    for zm_client in hass.data[ZONEMINDER_DOMAIN].values():
+    for zm_client in hass.data[DOMAIN].values():
         if not (monitors := zm_client.get_monitors()):
             raise PlatformNotReady(
                 "Switch could not fetch any monitors from ZoneMinder"