From b175f424d69952dbe8d93aca25c59721cb59fb9c Mon Sep 17 00:00:00 2001
From: epenet <6771947+epenet@users.noreply.github.com>
Date: Thu, 28 Oct 2021 09:39:42 +0200
Subject: [PATCH] Use DeviceInfo in spider (#58575)
Co-authored-by: epenet <epenet@users.noreply.github.com>
---
homeassistant/components/spider/climate.py | 15 +++++++-------
homeassistant/components/spider/sensor.py | 24 +++++++++++-----------
homeassistant/components/spider/switch.py | 15 +++++++-------
3 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/homeassistant/components/spider/climate.py b/homeassistant/components/spider/climate.py
index fbae603a239..72ae67c7600 100644
--- a/homeassistant/components/spider/climate.py
+++ b/homeassistant/components/spider/climate.py
@@ -8,6 +8,7 @@ from homeassistant.components.climate.const import (
SUPPORT_TARGET_TEMPERATURE,
)
from homeassistant.const import ATTR_TEMPERATURE, TEMP_CELSIUS
+from homeassistant.helpers.entity import DeviceInfo
from .const import DOMAIN
@@ -46,14 +47,14 @@ class SpiderThermostat(ClimateEntity):
self.support_hvac.append(SPIDER_STATE_TO_HA[operation_value])
@property
- def device_info(self):
+ def device_info(self) -> DeviceInfo:
"""Return the device_info of the device."""
- return {
- "identifiers": {(DOMAIN, self.thermostat.id)},
- "name": self.thermostat.name,
- "manufacturer": self.thermostat.manufacturer,
- "model": self.thermostat.model,
- }
+ return DeviceInfo(
+ identifiers={(DOMAIN, self.thermostat.id)},
+ manufacturer=self.thermostat.manufacturer,
+ model=self.thermostat.model,
+ name=self.thermostat.name,
+ )
@property
def supported_features(self):
diff --git a/homeassistant/components/spider/sensor.py b/homeassistant/components/spider/sensor.py
index 8b38fdbe6f6..c390e060194 100644
--- a/homeassistant/components/spider/sensor.py
+++ b/homeassistant/components/spider/sensor.py
@@ -42,12 +42,12 @@ class SpiderPowerPlugEnergy(SensorEntity):
@property
def device_info(self) -> DeviceInfo:
"""Return the device_info of the device."""
- return {
- "identifiers": {(DOMAIN, self.power_plug.id)},
- "name": self.power_plug.name,
- "manufacturer": self.power_plug.manufacturer,
- "model": self.power_plug.model,
- }
+ return DeviceInfo(
+ identifiers={(DOMAIN, self.power_plug.id)},
+ manufacturer=self.power_plug.manufacturer,
+ model=self.power_plug.model,
+ name=self.power_plug.name,
+ )
@property
def unique_id(self) -> str:
@@ -84,12 +84,12 @@ class SpiderPowerPlugPower(SensorEntity):
@property
def device_info(self) -> DeviceInfo:
"""Return the device_info of the device."""
- return {
- "identifiers": {(DOMAIN, self.power_plug.id)},
- "name": self.power_plug.name,
- "manufacturer": self.power_plug.manufacturer,
- "model": self.power_plug.model,
- }
+ return DeviceInfo(
+ identifiers={(DOMAIN, self.power_plug.id)},
+ manufacturer=self.power_plug.manufacturer,
+ model=self.power_plug.model,
+ name=self.power_plug.name,
+ )
@property
def unique_id(self) -> str:
diff --git a/homeassistant/components/spider/switch.py b/homeassistant/components/spider/switch.py
index ceb814b234a..4569105b8f4 100644
--- a/homeassistant/components/spider/switch.py
+++ b/homeassistant/components/spider/switch.py
@@ -1,5 +1,6 @@
"""Support for Spider switches."""
from homeassistant.components.switch import SwitchEntity
+from homeassistant.helpers.entity import DeviceInfo
from .const import DOMAIN
@@ -24,14 +25,14 @@ class SpiderPowerPlug(SwitchEntity):
self.power_plug = power_plug
@property
- def device_info(self):
+ def device_info(self) -> DeviceInfo:
"""Return the device_info of the device."""
- return {
- "identifiers": {(DOMAIN, self.power_plug.id)},
- "name": self.power_plug.name,
- "manufacturer": self.power_plug.manufacturer,
- "model": self.power_plug.model,
- }
+ return DeviceInfo(
+ identifiers={(DOMAIN, self.power_plug.id)},
+ manufacturer=self.power_plug.manufacturer,
+ model=self.power_plug.model,
+ name=self.power_plug.name,
+ )
@property
def unique_id(self):