Use homeassistant.const instead of integration const for device_info ATTR_ (#53703)

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,

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"

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 (
+from .const import ATTR_TARGET_TEMPERATURE, DATA_BSBLAN_CLIENT, DOMAIN
-    ATTR_IDENTIFIERS,
-    ATTR_MANUFACTURER,
-    ATTR_MODEL,
-    ATTR_TARGET_TEMPERATURE,
-    DATA_BSBLAN_CLIENT,
-    DOMAIN,
-)
 
 _LOGGER = logging.getLogger(__name__)
 

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"

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"

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.const import (
-from homeassistant.helpers.entity import DeviceInfo, Entity
-
-from .const import (
     ATTR_IDENTIFIERS,
     ATTR_MANUFACTURER,
     ATTR_MODEL,
-    ATTR_SOFTWARE_VERSION,
+    ATTR_NAME,
-    ATTR_VIA_DEVICE,
+    ATTR_SW_VERSION,
-    DOMAIN,
 )
+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),
         }

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(

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:
+        if ATTR_SW_VERSION in self.config:
-            sw_version = format_sw_version(self.config[ATTR_SOFTWARE_VERSION])
+            sw_version = format_sw_version(self.config[ATTR_SW_VERSION])
         else:
             sw_version = __version__
 

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"

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"

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.const import (
-from homeassistant.helpers.entity import DeviceInfo
-from homeassistant.helpers.update_coordinator import CoordinatorEntity
-
-from .const import (
     ATTR_IDENTIFIERS,
     ATTR_MANUFACTURER,
     ATTR_MODEL,
-    ATTR_SOFTWARE_VERSION,
+    ATTR_NAME,
-    DOMAIN,
+    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,
         }

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"

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,

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"

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 (
+from .const import ALL_ITEM_KINDS, DOMAIN
-    ALL_ITEM_KINDS,
-    ATTR_IDENTIFIERS,
-    ATTR_MANUFACTURER,
-    ATTR_MODEL,
-    DOMAIN,
-)
 
 _LOGGER = logging.getLogger(__name__)
 

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",

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"

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",
         }

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]

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",
         },
     )