diff --git a/homeassistant/components/aurora/__init__.py b/homeassistant/components/aurora/__init__.py index 576ccc1275b..0c80cda4bd5 100644 --- a/homeassistant/components/aurora/__init__.py +++ b/homeassistant/components/aurora/__init__.py @@ -7,7 +7,15 @@ from aiohttp import ClientError from auroranoaa import AuroraForecast from homeassistant.config_entries import ConfigEntry -from homeassistant.const import ATTR_NAME, CONF_LATITUDE, CONF_LONGITUDE, CONF_NAME +from homeassistant.const import ( + ATTR_IDENTIFIERS, + ATTR_MANUFACTURER, + ATTR_MODEL, + ATTR_NAME, + CONF_LATITUDE, + CONF_LONGITUDE, + CONF_NAME, +) from homeassistant.core import HomeAssistant from homeassistant.helpers import aiohttp_client from homeassistant.helpers.update_coordinator import ( @@ -18,9 +26,6 @@ from homeassistant.helpers.update_coordinator import ( from .const import ( ATTR_ENTRY_TYPE, - ATTR_IDENTIFIERS, - ATTR_MANUFACTURER, - ATTR_MODEL, ATTRIBUTION, AURORA_API, CONF_THRESHOLD, diff --git a/homeassistant/components/aurora/const.py b/homeassistant/components/aurora/const.py index cd6f54a3d0c..8ce6bbad3f9 100644 --- a/homeassistant/components/aurora/const.py +++ b/homeassistant/components/aurora/const.py @@ -3,9 +3,6 @@ DOMAIN = "aurora" COORDINATOR = "coordinator" AURORA_API = "aurora_api" -ATTR_IDENTIFIERS = "identifiers" -ATTR_MANUFACTURER = "manufacturer" -ATTR_MODEL = "model" ATTR_ENTRY_TYPE = "entry_type" DEFAULT_POLLING_INTERVAL = 5 CONF_THRESHOLD = "forecast_threshold" diff --git a/homeassistant/components/bsblan/climate.py b/homeassistant/components/bsblan/climate.py index 160c4f9d9b3..23259101224 100644 --- a/homeassistant/components/bsblan/climate.py +++ b/homeassistant/components/bsblan/climate.py @@ -21,6 +21,9 @@ from homeassistant.components.climate.const import ( ) from homeassistant.config_entries import ConfigEntry from homeassistant.const import ( + ATTR_IDENTIFIERS, + ATTR_MANUFACTURER, + ATTR_MODEL, ATTR_NAME, ATTR_TEMPERATURE, TEMP_CELSIUS, @@ -29,14 +32,7 @@ from homeassistant.const import ( from homeassistant.core import HomeAssistant from homeassistant.helpers.entity_platform import AddEntitiesCallback -from .const import ( - ATTR_IDENTIFIERS, - ATTR_MANUFACTURER, - ATTR_MODEL, - ATTR_TARGET_TEMPERATURE, - DATA_BSBLAN_CLIENT, - DOMAIN, -) +from .const import ATTR_TARGET_TEMPERATURE, DATA_BSBLAN_CLIENT, DOMAIN _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/bsblan/const.py b/homeassistant/components/bsblan/const.py index e65100af90d..0dc2e15a7b4 100644 --- a/homeassistant/components/bsblan/const.py +++ b/homeassistant/components/bsblan/const.py @@ -7,10 +7,6 @@ DATA_BSBLAN_CLIENT: Final = "bsblan_client" DATA_BSBLAN_TIMER: Final = "bsblan_timer" DATA_BSBLAN_UPDATED: Final = "bsblan_updated" -ATTR_IDENTIFIERS: Final = "identifiers" -ATTR_MODEL: Final = "model" -ATTR_MANUFACTURER: Final = "manufacturer" - ATTR_TARGET_TEMPERATURE: Final = "target_temperature" ATTR_INSIDE_TEMPERATURE: Final = "inside_temperature" ATTR_OUTSIDE_TEMPERATURE: Final = "outside_temperature" diff --git a/homeassistant/components/directv/const.py b/homeassistant/components/directv/const.py index 9ad01a0179b..853386fd1d8 100644 --- a/homeassistant/components/directv/const.py +++ b/homeassistant/components/directv/const.py @@ -3,14 +3,10 @@ DOMAIN = "directv" # Attributes -ATTR_IDENTIFIERS = "identifiers" -ATTR_MANUFACTURER = "manufacturer" ATTR_MEDIA_CURRENTLY_RECORDING = "media_currently_recording" ATTR_MEDIA_RATING = "media_rating" ATTR_MEDIA_RECORDED = "media_recorded" ATTR_MEDIA_START_TIME = "media_start_time" -ATTR_MODEL = "model" -ATTR_SOFTWARE_VERSION = "sw_version" ATTR_VIA_DEVICE = "via_device" CONF_RECEIVER_ID = "receiver_id" diff --git a/homeassistant/components/directv/entity.py b/homeassistant/components/directv/entity.py index c632ad7e84c..2e6ffb81a52 100644 --- a/homeassistant/components/directv/entity.py +++ b/homeassistant/components/directv/entity.py @@ -3,17 +3,16 @@ from __future__ import annotations from directv import DIRECTV -from homeassistant.const import ATTR_NAME -from homeassistant.helpers.entity import DeviceInfo, Entity - -from .const import ( +from homeassistant.const import ( ATTR_IDENTIFIERS, ATTR_MANUFACTURER, ATTR_MODEL, - ATTR_SOFTWARE_VERSION, - ATTR_VIA_DEVICE, - DOMAIN, + ATTR_NAME, + ATTR_SW_VERSION, ) +from homeassistant.helpers.entity import DeviceInfo, Entity + +from .const import ATTR_VIA_DEVICE, DOMAIN class DIRECTVEntity(Entity): @@ -34,6 +33,6 @@ class DIRECTVEntity(Entity): ATTR_NAME: self.name, ATTR_MANUFACTURER: self.dtv.device.info.brand, ATTR_MODEL: None, - ATTR_SOFTWARE_VERSION: self.dtv.device.info.version, + ATTR_SW_VERSION: self.dtv.device.info.version, ATTR_VIA_DEVICE: (DOMAIN, self.dtv.device.info.receiver_id), } diff --git a/homeassistant/components/homekit/__init__.py b/homeassistant/components/homekit/__init__.py index f85c8ad5063..967acaf7ddc 100644 --- a/homeassistant/components/homekit/__init__.py +++ b/homeassistant/components/homekit/__init__.py @@ -25,6 +25,9 @@ from homeassistant.const import ( ATTR_BATTERY_LEVEL, ATTR_DEVICE_ID, ATTR_ENTITY_ID, + ATTR_MANUFACTURER, + ATTR_MODEL, + ATTR_SW_VERSION, CONF_IP_ADDRESS, CONF_NAME, CONF_PORT, @@ -61,9 +64,6 @@ from .accessories import HomeBridge, HomeDriver, get_accessory from .aidmanager import AccessoryAidStorage from .const import ( ATTR_INTEGRATION, - ATTR_MANUFACTURER, - ATTR_MODEL, - ATTR_SOFTWARE_VERSION, BRIDGE_NAME, BRIDGE_SERIAL_NUMBER, CONF_ADVERTISE_IP, @@ -886,7 +886,7 @@ class HomeKit: if dev_reg_ent.model: ent_cfg[ATTR_MODEL] = dev_reg_ent.model if dev_reg_ent.sw_version: - ent_cfg[ATTR_SOFTWARE_VERSION] = dev_reg_ent.sw_version + ent_cfg[ATTR_SW_VERSION] = dev_reg_ent.sw_version if ATTR_MANUFACTURER not in ent_cfg: try: integration = await async_get_integration( diff --git a/homeassistant/components/homekit/accessories.py b/homeassistant/components/homekit/accessories.py index 03d00c42a91..c13bb870551 100644 --- a/homeassistant/components/homekit/accessories.py +++ b/homeassistant/components/homekit/accessories.py @@ -18,8 +18,11 @@ from homeassistant.const import ( ATTR_BATTERY_LEVEL, ATTR_DEVICE_CLASS, ATTR_ENTITY_ID, + ATTR_MANUFACTURER, + ATTR_MODEL, ATTR_SERVICE, ATTR_SUPPORTED_FEATURES, + ATTR_SW_VERSION, ATTR_UNIT_OF_MEASUREMENT, CONF_NAME, CONF_TYPE, @@ -43,9 +46,6 @@ from homeassistant.util.decorator import Registry from .const import ( ATTR_DISPLAY_NAME, ATTR_INTEGRATION, - ATTR_MANUFACTURER, - ATTR_MODEL, - ATTR_SOFTWARE_VERSION, ATTR_VALUE, BRIDGE_MODEL, BRIDGE_SERIAL_NUMBER, @@ -231,8 +231,8 @@ class HomeAccessory(Accessory): model = self.config[ATTR_MODEL] else: model = domain.title() - if ATTR_SOFTWARE_VERSION in self.config: - sw_version = format_sw_version(self.config[ATTR_SOFTWARE_VERSION]) + if ATTR_SW_VERSION in self.config: + sw_version = format_sw_version(self.config[ATTR_SW_VERSION]) else: sw_version = __version__ diff --git a/homeassistant/components/homekit/const.py b/homeassistant/components/homekit/const.py index 4fecd64b2b2..d2802ec8fb0 100644 --- a/homeassistant/components/homekit/const.py +++ b/homeassistant/components/homekit/const.py @@ -22,9 +22,6 @@ AUDIO_CODEC_COPY = "copy" ATTR_DISPLAY_NAME = "display_name" ATTR_VALUE = "value" ATTR_INTEGRATION = "platform" -ATTR_MANUFACTURER = "manufacturer" -ATTR_MODEL = "model" -ATTR_SOFTWARE_VERSION = "sw_version" ATTR_KEY_NAME = "key_name" # Current attribute used by homekit_controller ATTR_OBSTRUCTION_DETECTED = "obstruction-detected" diff --git a/homeassistant/components/ipp/const.py b/homeassistant/components/ipp/const.py index d482f2d73e4..3501759074f 100644 --- a/homeassistant/components/ipp/const.py +++ b/homeassistant/components/ipp/const.py @@ -5,15 +5,11 @@ DOMAIN = "ipp" # Attributes ATTR_COMMAND_SET = "command_set" -ATTR_IDENTIFIERS = "identifiers" ATTR_INFO = "info" -ATTR_MANUFACTURER = "manufacturer" ATTR_MARKER_TYPE = "marker_type" ATTR_MARKER_LOW_LEVEL = "marker_low_level" ATTR_MARKER_HIGH_LEVEL = "marker_high_level" -ATTR_MODEL = "model" ATTR_SERIAL = "serial" -ATTR_SOFTWARE_VERSION = "sw_version" ATTR_STATE_MESSAGE = "state_message" ATTR_STATE_REASON = "state_reason" ATTR_URI_SUPPORTED = "uri_supported" diff --git a/homeassistant/components/ipp/entity.py b/homeassistant/components/ipp/entity.py index 0038bbd7370..55a0e76a658 100644 --- a/homeassistant/components/ipp/entity.py +++ b/homeassistant/components/ipp/entity.py @@ -1,17 +1,17 @@ """Entities for The Internet Printing Protocol (IPP) integration.""" from __future__ import annotations -from homeassistant.const import ATTR_NAME -from homeassistant.helpers.entity import DeviceInfo -from homeassistant.helpers.update_coordinator import CoordinatorEntity - -from .const import ( +from homeassistant.const import ( ATTR_IDENTIFIERS, ATTR_MANUFACTURER, ATTR_MODEL, - ATTR_SOFTWARE_VERSION, - DOMAIN, + ATTR_NAME, + ATTR_SW_VERSION, ) +from homeassistant.helpers.entity import DeviceInfo +from homeassistant.helpers.update_coordinator import CoordinatorEntity + +from .const import DOMAIN from .coordinator import IPPDataUpdateCoordinator @@ -47,5 +47,5 @@ class IPPEntity(CoordinatorEntity): ATTR_NAME: self.coordinator.data.info.name, ATTR_MANUFACTURER: self.coordinator.data.info.manufacturer, ATTR_MODEL: self.coordinator.data.info.model, - ATTR_SOFTWARE_VERSION: self.coordinator.data.info.version, + ATTR_SW_VERSION: self.coordinator.data.info.version, } diff --git a/homeassistant/components/kmtronic/const.py b/homeassistant/components/kmtronic/const.py index 8b34d423724..3bdb3074851 100644 --- a/homeassistant/components/kmtronic/const.py +++ b/homeassistant/components/kmtronic/const.py @@ -8,7 +8,5 @@ DATA_HUB = "hub" DATA_COORDINATOR = "coordinator" MANUFACTURER = "KMtronic" -ATTR_MANUFACTURER = "manufacturer" -ATTR_IDENTIFIERS = "identifiers" UPDATE_LISTENER = "update_listener" diff --git a/homeassistant/components/modern_forms/__init__.py b/homeassistant/components/modern_forms/__init__.py index a31b2655184..09ca43797af 100644 --- a/homeassistant/components/modern_forms/__init__.py +++ b/homeassistant/components/modern_forms/__init__.py @@ -17,7 +17,14 @@ from homeassistant.components.light import DOMAIN as LIGHT_DOMAIN from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN from homeassistant.config_entries import ConfigEntry -from homeassistant.const import ATTR_MODEL, ATTR_NAME, ATTR_SW_VERSION, CONF_HOST +from homeassistant.const import ( + ATTR_IDENTIFIERS, + ATTR_MANUFACTURER, + ATTR_MODEL, + ATTR_NAME, + ATTR_SW_VERSION, + CONF_HOST, +) from homeassistant.core import HomeAssistant from homeassistant.helpers.aiohttp_client import async_get_clientsession from homeassistant.helpers.entity import DeviceInfo @@ -27,7 +34,7 @@ from homeassistant.helpers.update_coordinator import ( UpdateFailed, ) -from .const import ATTR_IDENTIFIERS, ATTR_MANUFACTURER, DOMAIN +from .const import DOMAIN SCAN_INTERVAL = timedelta(seconds=5) PLATFORMS = [ @@ -153,7 +160,7 @@ class ModernFormsDeviceEntity(CoordinatorEntity[ModernFormsDataUpdateCoordinator def device_info(self) -> DeviceInfo: """Return device information about this Modern Forms device.""" return { - ATTR_IDENTIFIERS: {(DOMAIN, self.coordinator.data.info.mac_address)}, # type: ignore + ATTR_IDENTIFIERS: {(DOMAIN, self.coordinator.data.info.mac_address)}, ATTR_NAME: self.coordinator.data.info.device_name, ATTR_MANUFACTURER: "Modern Forms", ATTR_MODEL: self.coordinator.data.info.fan_type, diff --git a/homeassistant/components/modern_forms/const.py b/homeassistant/components/modern_forms/const.py index 9dbefcfc570..b96cf57351c 100644 --- a/homeassistant/components/modern_forms/const.py +++ b/homeassistant/components/modern_forms/const.py @@ -2,9 +2,6 @@ DOMAIN = "modern_forms" -ATTR_IDENTIFIERS = "identifiers" -ATTR_MANUFACTURER = "manufacturer" - OPT_ON = "on" OPT_SPEED = "speed" OPT_BRIGHTNESS = "brightness" diff --git a/homeassistant/components/omnilogic/common.py b/homeassistant/components/omnilogic/common.py index a103b8d112c..798c5abd69e 100644 --- a/homeassistant/components/omnilogic/common.py +++ b/homeassistant/components/omnilogic/common.py @@ -6,7 +6,12 @@ import logging from omnilogic import OmniLogic, OmniLogicException from homeassistant.config_entries import ConfigEntry -from homeassistant.const import ATTR_NAME +from homeassistant.const import ( + ATTR_IDENTIFIERS, + ATTR_MANUFACTURER, + ATTR_MODEL, + ATTR_NAME, +) from homeassistant.core import HomeAssistant from homeassistant.helpers.update_coordinator import ( CoordinatorEntity, @@ -14,13 +19,7 @@ from homeassistant.helpers.update_coordinator import ( UpdateFailed, ) -from .const import ( - ALL_ITEM_KINDS, - ATTR_IDENTIFIERS, - ATTR_MANUFACTURER, - ATTR_MODEL, - DOMAIN, -) +from .const import ALL_ITEM_KINDS, DOMAIN _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/omnilogic/const.py b/homeassistant/components/omnilogic/const.py index 41db7be5064..a00a7d7021d 100644 --- a/homeassistant/components/omnilogic/const.py +++ b/homeassistant/components/omnilogic/const.py @@ -6,9 +6,6 @@ DEFAULT_SCAN_INTERVAL = 6 DEFAULT_PH_OFFSET = 0 COORDINATOR = "coordinator" OMNI_API = "omni_api" -ATTR_IDENTIFIERS = "identifiers" -ATTR_MANUFACTURER = "manufacturer" -ATTR_MODEL = "model" PUMP_TYPES = { "FMT_VARIABLE_SPEED_PUMP": "VARIABLE", diff --git a/homeassistant/components/sonarr/const.py b/homeassistant/components/sonarr/const.py index 45b26166c92..be0fa00d597 100644 --- a/homeassistant/components/sonarr/const.py +++ b/homeassistant/components/sonarr/const.py @@ -1,11 +1,6 @@ """Constants for Sonarr.""" DOMAIN = "sonarr" -# Attributes -ATTR_IDENTIFIERS = "identifiers" -ATTR_MANUFACTURER = "manufacturer" -ATTR_SOFTWARE_VERSION = "sw_version" - # Config Keys CONF_BASE_PATH = "base_path" CONF_DAYS = "days" diff --git a/homeassistant/components/sonarr/entity.py b/homeassistant/components/sonarr/entity.py index 3fc74b1ddb5..d3f1b089d14 100644 --- a/homeassistant/components/sonarr/entity.py +++ b/homeassistant/components/sonarr/entity.py @@ -3,10 +3,15 @@ from __future__ import annotations from sonarr import Sonarr -from homeassistant.const import ATTR_NAME +from homeassistant.const import ( + ATTR_IDENTIFIERS, + ATTR_MANUFACTURER, + ATTR_NAME, + ATTR_SW_VERSION, +) from homeassistant.helpers.entity import DeviceInfo, Entity -from .const import ATTR_IDENTIFIERS, ATTR_MANUFACTURER, ATTR_SOFTWARE_VERSION, DOMAIN +from .const import DOMAIN class SonarrEntity(Entity): @@ -34,6 +39,6 @@ class SonarrEntity(Entity): ATTR_IDENTIFIERS: {(DOMAIN, self._device_id)}, ATTR_NAME: "Activity Sensor", ATTR_MANUFACTURER: "Sonarr", - ATTR_SOFTWARE_VERSION: self.sonarr.app.info.version, + ATTR_SW_VERSION: self.sonarr.app.info.version, "entry_type": "service", } diff --git a/homeassistant/components/yamaha_musiccast/const.py b/homeassistant/components/yamaha_musiccast/const.py index b442a3135b9..d7daaab4117 100644 --- a/homeassistant/components/yamaha_musiccast/const.py +++ b/homeassistant/components/yamaha_musiccast/const.py @@ -11,12 +11,8 @@ DOMAIN = "yamaha_musiccast" BRAND = "Yamaha Corporation" # Attributes -ATTR_IDENTIFIERS = "identifiers" -ATTR_MANUFACTURER = "manufacturer" -ATTR_MODEL = "model" ATTR_PLAYLIST = "playlist" ATTR_PRESET = "preset" -ATTR_SOFTWARE_VERSION = "sw_version" ATTR_MC_LINK = "mc_link" ATTR_MAIN_SYNC = "main_sync" ATTR_MC_LINK_SOURCES = [ATTR_MC_LINK, ATTR_MAIN_SYNC] diff --git a/tests/components/homekit/test_accessories.py b/tests/components/homekit/test_accessories.py index 3f2c4b67497..987a90ce61a 100644 --- a/tests/components/homekit/test_accessories.py +++ b/tests/components/homekit/test_accessories.py @@ -14,9 +14,6 @@ from homeassistant.components.homekit.accessories import ( from homeassistant.components.homekit.const import ( ATTR_DISPLAY_NAME, ATTR_INTEGRATION, - ATTR_MANUFACTURER, - ATTR_MODEL, - ATTR_SOFTWARE_VERSION, ATTR_VALUE, BRIDGE_MODEL, BRIDGE_NAME, @@ -36,7 +33,10 @@ from homeassistant.const import ( ATTR_BATTERY_CHARGING, ATTR_BATTERY_LEVEL, ATTR_ENTITY_ID, + ATTR_MANUFACTURER, + ATTR_MODEL, ATTR_SERVICE, + ATTR_SW_VERSION, STATE_OFF, STATE_ON, STATE_UNAVAILABLE, @@ -105,7 +105,7 @@ async def test_home_accessory(hass, hk_driver): { ATTR_MODEL: "Awesome", ATTR_MANUFACTURER: "Lux Brands", - ATTR_SOFTWARE_VERSION: "0.4.3", + ATTR_SW_VERSION: "0.4.3", ATTR_INTEGRATION: "luxe", }, )