Remove deprecated device_state_attributes

niceboygithub · Dec 12, 2021 · 80003b7 · 80003b7
1 parent 942b937
commit 80003b7
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 24 deletions.
diff --git a/custom_components/aqara_gateway/__init__.py b/custom_components/aqara_gateway/__init__.py
@@ -229,11 +229,6 @@ def available(self) -> bool:
         """ return available """
         return self.device.get('online', True)
 
-    @property
-    def device_state_attributes(self):
-        """ return attrs """
-        return self._attrs
-
     @property
     def device_info(self):
         """

diff --git a/custom_components/aqara_gateway/air_quality.py b/custom_components/aqara_gateway/air_quality.py
@@ -75,7 +75,7 @@ def __init__(self, gateway, device, attr):
         self.is_metric = False
 
     @property
-    def device_state_attributes(self):
+    def extra_state_attributes(self):
         """Return the state attributes."""
         attrs = {
             ATTR_BATTERY_LEVEL: self._battery,
@@ -189,7 +189,7 @@ def __init__(self, gateway, device, attr):
         self._state = 0
 
     @property
-    def device_state_attributes(self):
+    def extra_state_attributes(self):
         """Return the state attributes."""
         attrs = {
             ATTR_BATTERY_LEVEL: self._battery,

diff --git a/custom_components/aqara_gateway/binary_sensor.py b/custom_components/aqara_gateway/binary_sensor.py
@@ -129,7 +129,7 @@ def __init__(
         super().__init__(gateway, device, attr)
 
     @property
-    def device_state_attributes(self):
+    def extra_state_attributes(self):
         """Return the state attributes."""
         attrs = {
             ATTR_CHIP_TEMPERATURE: self._chip_temperature,
@@ -187,7 +187,7 @@ async def async_added_to_hass(self):
         await super().async_added_to_hass()
 
     @property
-    def device_state_attributes(self):
+    def extra_state_attributes(self):
         """Return the state attributes."""
         self._attrs[ATTR_BATTERY_LEVEL] = self._battery
         self._attrs[ATTR_CHIP_TEMPERATURE] = self._chip_temperature
@@ -321,7 +321,7 @@ def __init__(
         super().__init__(gateway, device, attr)
 
     @property
-    def device_state_attributes(self):
+    def extra_state_attributes(self):
         """Return the state attributes."""
         attrs = {
             ATTR_BATTERY_LEVEL: self._battery,
@@ -387,7 +387,7 @@ def __init__(
         super().__init__(gateway, device, attr)
 
     @property
-    def device_state_attributes(self):
+    def extra_state_attributes(self):
         """Return the state attributes."""
         attrs = {
             ATTR_BATTERY_LEVEL: self._battery,
@@ -450,7 +450,7 @@ def __init__(
         super().__init__(gateway, device, attr)
 
     @property
-    def device_state_attributes(self):
+    def extra_state_attributes(self):
         """Return the state attributes."""
         attrs = {
             ATTR_CHIP_TEMPERATURE: self._chip_temperature,
@@ -518,7 +518,7 @@ def icon(self):
         return 'hass:radiobox-blank'
 
     @property
-    def device_state_attributes(self):
+    def extra_state_attributes(self):
         """Return the state attributes."""
         attrs = {
             ATTR_BATTERY_LEVEL: self._battery,
@@ -619,7 +619,7 @@ def icon(self):
         return 'hass:radiobox-blank'
 
     @property
-    def device_state_attributes(self):
+    def extra_state_attributes(self):
         """Return the state attributes."""
         self._attrs[ATTR_BATTERY_LEVEL] = self._battery
         self._attrs[ATTR_CHIP_TEMPERATURE] = self._chip_temperature

diff --git a/custom_components/aqara_gateway/core/gateway.py b/custom_components/aqara_gateway/core/gateway.py
@@ -51,7 +51,7 @@ def __init__(self, hass, host: str, config: dict, **options):
         self.devices = {}
         self.updates = {}
         self.setups = {}
-        self._device_state_attributes = {}
+        self._extra_state_attributes = {}
         self._info_ts = None
         self._gateway_did = ''
         self._model = options.get(CONF_MODEL, '')  # long model, will replace to short later
@@ -324,21 +324,21 @@ def setup_devices(self, devices: list):
 
     def add_stats(self, ieee: str, handler):
         """ add gateway stats """
-        self._device_state_attributes[ieee] = handler
+        self._extra_state_attributes[ieee] = handler
 
         if self.parent_scan_interval > 0:
             self._info_ts = time.time() + 5
 
     def remove_stats(self, ieee: str, handler):
         """ remove gateway stats """
-        self._device_state_attributes.pop(ieee)
+        self._extra_state_attributes.pop(ieee)
 
     def process_gateway_stats(self, payload: dict = None):
         """ process gateway status """
         # empty payload - update available state
         self.debug(f"gateway <= {payload or self.available}")
 
-        if 'lumi.0' not in self._device_state_attributes:
+        if 'lumi.0' not in self._extra_state_attributes:
             return
 
         if payload:
@@ -384,7 +384,7 @@ def process_gateway_stats(self, payload: dict = None):
                 value = json.loads(raw)
                 data.update(value)
 
-        self._device_state_attributes['lumi.0'](data)
+        self._extra_state_attributes['lumi.0'](data)
 
     def on_connect(self, client, userdata, flags, ret):
         # pylint: disable=unused-argument

diff --git a/custom_components/aqara_gateway/cover.py b/custom_components/aqara_gateway/cover.py
@@ -139,7 +139,7 @@ def set_cover_position(self, **kwargs):
         self.gateway.send(self.device, {'position': position})
 
     @property
-    def device_state_attributes(self):
+    def extra_state_attributes(self):
         """Return the state attributes."""
         self._attrs[ATTR_CURRENT_POSITION] = self._pos
         self._attrs[ATTR_CHIP_TEMPERATURE] = self._chip_temperature

diff --git a/custom_components/aqara_gateway/light.py b/custom_components/aqara_gateway/light.py
@@ -107,7 +107,7 @@ def supported_features(self):
         return features
 
     @property
-    def device_state_attributes(self):
+    def extra_state_attributes(self):
         """Return the state attributes."""
         if self.device['type'] == 'zigbee':
             self._attrs[ATTR_CHIP_TEMPERATURE] = self._chip_temperature

diff --git a/custom_components/aqara_gateway/sensor.py b/custom_components/aqara_gateway/sensor.py
@@ -145,7 +145,7 @@ def icon(self):
         return ICONS.get(self._attr)
 
     @property
-    def device_state_attributes(self):
+    def extra_state_attributes(self):
         """Return the state attributes."""
         if self.with_attr:
             attrs = {
@@ -349,7 +349,7 @@ def device_class(self):
         return "lock_state"
 
     @property
-    def device_state_attributes(self):
+    def extra_state_attributes(self):
         """Return the state attributes."""
         attrs = {
             ATTR_BATTERY_LEVEL: self._battery,

diff --git a/custom_components/aqara_gateway/switch.py b/custom_components/aqara_gateway/switch.py
@@ -78,7 +78,7 @@ def icon(self):
         return 'mdi:power-socket'
 
     @property
-    def device_state_attributes(self):
+    def extra_state_attributes(self):
         """Return the state attributes."""
         self._attrs[ATTR_CHIP_TEMPERATURE] = self._chip_temperature
         self._attrs[ATTR_FW_VER] = self._fw_ver