deCONZ - Library cleanup (#31410)

* Follow library changes

* Bump dependency to v70

* Fix test

homeassistant/components/deconz/deconz_device.py

@@ -81,7 +81,7 @@ class DeconzDevice(DeconzBase, Entity):
 
     async def async_added_to_hass(self):
         """Subscribe to device events."""
-        self._device.register_async_callback(self.async_update_callback)
+        self._device.register_callback(self.async_update_callback)
         self.gateway.deconz_ids[self.entity_id] = self._device.deconz_id
         self.listeners.append(
             async_dispatcher_connect(

homeassistant/components/deconz/deconz_event.py

@@ -21,7 +21,7 @@ class DeconzEvent(DeconzBase):
         """Register callback that will be used for signals."""
         super().__init__(device, gateway)
 
-        self._device.register_async_callback(self.async_update_callback)
+        self._device.register_callback(self.async_update_callback)
 
         self.device_id = None
         self.event_id = slugify(self._device.name)

homeassistant/components/deconz/light.py

@@ -156,7 +156,7 @@ class DeconzLight(DeconzDevice, Light):
 
         if ATTR_TRANSITION in kwargs:
             data["transitiontime"] = int(kwargs[ATTR_TRANSITION] * 10)
-        elif "IKEA" in (self._device.manufacturer or ""):
+        elif "IKEA" in self._device.manufacturer:
             data["transitiontime"] = 0
 
         if ATTR_FLASH in kwargs:

homeassistant/components/deconz/manifest.json

@@ -4,7 +4,7 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/deconz",
   "requirements": [
-    "pydeconz==69"
+    "pydeconz==70"
   ],
   "ssdp": [
     {

homeassistant/components/deconz/sensor.py

@@ -216,7 +216,7 @@ class DeconzSensorStateTracker:
         """Set up tracker."""
         self.sensor = sensor
         self.gateway = gateway
-        sensor.register_async_callback(self.async_update_callback)
+        sensor.register_callback(self.async_update_callback)
 
     @callback
     def close(self):

requirements_all.txt

@@ -1188,7 +1188,7 @@ pydaikin==1.6.2
 pydanfossair==0.1.0
 
 # homeassistant.components.deconz
-pydeconz==69
+pydeconz==70
 
 # homeassistant.components.delijn
 pydelijn==0.5.1

requirements_test_all.txt

@@ -423,7 +423,7 @@ pycoolmasternet==0.0.4
 pydaikin==1.6.2
 
 # homeassistant.components.deconz
-pydeconz==69
+pydeconz==70
 
 # homeassistant.components.zwave
 pydispatcher==2.0.5

tests/components/deconz/test_binary_sensor.py

@@ -96,7 +96,7 @@ async def test_binary_sensors(hass):
         "id": "1",
         "state": {"presence": True},
     }
-    gateway.api.async_event_handler(state_changed_event)
+    gateway.api.event_handler(state_changed_event)
     await hass.async_block_till_done()
 
     presence_sensor = hass.states.get("binary_sensor.presence_sensor")
@@ -147,7 +147,7 @@ async def test_add_new_binary_sensor(hass):
         "id": "1",
         "sensor": deepcopy(SENSORS["1"]),
     }
-    gateway.api.async_event_handler(state_added_event)
+    gateway.api.event_handler(state_added_event)
     await hass.async_block_till_done()
 
     assert "binary_sensor.presence_sensor" in gateway.deconz_ids

tests/components/deconz/test_climate.py

@@ -95,7 +95,7 @@ async def test_climate_devices(hass):
         "id": "1",
         "config": {"mode": "off"},
     }
-    gateway.api.async_event_handler(state_changed_event)
+    gateway.api.event_handler(state_changed_event)
     await hass.async_block_till_done()
 
     thermostat = hass.states.get("climate.thermostat")
@@ -109,7 +109,7 @@ async def test_climate_devices(hass):
         "config": {"mode": "other"},
         "state": {"on": True},
     }
-    gateway.api.async_event_handler(state_changed_event)
+    gateway.api.event_handler(state_changed_event)
     await hass.async_block_till_done()
 
     thermostat = hass.states.get("climate.thermostat")
@@ -122,7 +122,7 @@ async def test_climate_devices(hass):
         "id": "1",
         "state": {"on": False},
     }
-    gateway.api.async_event_handler(state_changed_event)
+    gateway.api.event_handler(state_changed_event)
     await hass.async_block_till_done()
 
     thermostat = hass.states.get("climate.thermostat")
@@ -232,7 +232,7 @@ async def test_verify_state_update(hass):
         "id": "1",
         "state": {"on": False},
     }
-    gateway.api.async_event_handler(state_changed_event)
+    gateway.api.event_handler(state_changed_event)
     await hass.async_block_till_done()
 
     thermostat = hass.states.get("climate.thermostat")
@@ -252,7 +252,7 @@ async def test_add_new_climate_device(hass):
         "id": "1",
         "sensor": deepcopy(SENSORS["1"]),
     }
-    gateway.api.async_event_handler(state_added_event)
+    gateway.api.event_handler(state_added_event)
     await hass.async_block_till_done()
 
     assert "climate.thermostat" in gateway.deconz_ids

tests/components/deconz/test_cover.py

@@ -74,7 +74,7 @@ async def test_cover(hass):
         "id": "1",
         "state": {"on": True},
     }
-    gateway.api.async_event_handler(state_changed_event)
+    gateway.api.event_handler(state_changed_event)
     await hass.async_block_till_done()
 
     level_controllable_cover = hass.states.get("cover.level_controllable_cover")

tests/components/deconz/test_deconz_event.py

@@ -70,7 +70,7 @@ async def test_deconz_events(hass):
     mock_listener = Mock()
     unsub = hass.bus.async_listen(CONF_DECONZ_EVENT, mock_listener)
 
-    gateway.api.sensors["1"].async_update({"state": {"buttonevent": 2000}})
+    gateway.api.sensors["1"].update({"state": {"buttonevent": 2000}})
     await hass.async_block_till_done()
 
     assert len(mock_listener.mock_calls) == 1
@@ -85,7 +85,7 @@ async def test_deconz_events(hass):
     mock_listener = Mock()
     unsub = hass.bus.async_listen(CONF_DECONZ_EVENT, mock_listener)
 
-    gateway.api.sensors["3"].async_update({"state": {"buttonevent": 2000}})
+    gateway.api.sensors["3"].update({"state": {"buttonevent": 2000}})
     await hass.async_block_till_done()
 
     assert len(mock_listener.mock_calls) == 1
@@ -101,7 +101,7 @@ async def test_deconz_events(hass):
     mock_listener = Mock()
     unsub = hass.bus.async_listen(CONF_DECONZ_EVENT, mock_listener)
 
-    gateway.api.sensors["4"].async_update({"state": {"gesture": 0}})
+    gateway.api.sensors["4"].update({"state": {"gesture": 0}})
     await hass.async_block_till_done()
 
     assert len(mock_listener.mock_calls) == 1

tests/components/deconz/test_light.py

@@ -131,7 +131,7 @@ async def test_lights_and_groups(hass):
         "id": "1",
         "state": {"on": False},
     }
-    gateway.api.async_event_handler(state_changed_event)
+    gateway.api.event_handler(state_changed_event)
     await hass.async_block_till_done()
 
     rgb_light = hass.states.get("light.rgb_light")

tests/components/deconz/test_sensor.py

@@ -144,7 +144,7 @@ async def test_sensors(hass):
         "id": "1",
         "state": {"lightlevel": 2000},
     }
-    gateway.api.async_event_handler(state_changed_event)
+    gateway.api.event_handler(state_changed_event)
 
     state_changed_event = {
         "t": "event",
@@ -153,7 +153,7 @@ async def test_sensors(hass):
         "id": "4",
         "config": {"battery": 75},
     }
-    gateway.api.async_event_handler(state_changed_event)
+    gateway.api.event_handler(state_changed_event)
     await hass.async_block_till_done()
 
     light_level_sensor = hass.states.get("sensor.light_level_sensor")
@@ -231,7 +231,7 @@ async def test_add_new_sensor(hass):
         "id": "1",
         "sensor": deepcopy(SENSORS["1"]),
     }
-    gateway.api.async_event_handler(state_added_event)
+    gateway.api.event_handler(state_added_event)
     await hass.async_block_till_done()
 
     assert "sensor.light_level_sensor" in gateway.deconz_ids
@@ -248,14 +248,14 @@ async def test_add_battery_later(hass):
     remote = gateway.api.sensors["1"]
     assert len(gateway.deconz_ids) == 0
     assert len(gateway.events) == 1
-    assert len(remote._async_callbacks) == 2
+    assert len(remote._callbacks) == 2
 
-    remote.async_update({"config": {"battery": 50}})
+    remote.update({"config": {"battery": 50}})
     await hass.async_block_till_done()
 
     assert len(gateway.deconz_ids) == 1
     assert len(gateway.events) == 1
-    assert len(remote._async_callbacks) == 2
+    assert len(remote._callbacks) == 2
 
     battery_sensor = hass.states.get("sensor.switch_1_battery_level")
     assert battery_sensor is not None

tests/components/deconz/test_switch.py

@@ -97,7 +97,7 @@ async def test_switches(hass):
         "id": "1",
         "state": {"on": False},
     }
-    gateway.api.async_event_handler(state_changed_event)
+    gateway.api.event_handler(state_changed_event)
     state_changed_event = {
         "t": "event",
         "e": "changed",
@@ -105,7 +105,7 @@ async def test_switches(hass):
         "id": "3",
         "state": {"alert": None},
     }
-    gateway.api.async_event_handler(state_changed_event)
+    gateway.api.event_handler(state_changed_event)
     await hass.async_block_till_done()
 
     on_off_switch = hass.states.get("switch.on_off_switch")