From 522dc226099b9041ca8c22c6332fd5ddc027c4b5 Mon Sep 17 00:00:00 2001 From: Marc Date: Sun, 11 Aug 2024 13:15:58 +0200 Subject: [PATCH 1/2] FIX deprecated errors FIX WARNING (ImportExecutor_0) [homeassistant.helpers.typing] HomeAssistantType was used from speedport, this is a deprecated alias which will be removed in HA Core 2025.5. Use homeassistant.core.HomeAssistant instead, please report it to the author of the 'speedport' custom integration Errors --- custom_components/speedport/button.py | 9 ++++----- custom_components/speedport/device.py | 10 +++++----- custom_components/speedport/switch.py | 9 ++++----- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/custom_components/speedport/button.py b/custom_components/speedport/button.py index dbcb9fd..98a8672 100644 --- a/custom_components/speedport/button.py +++ b/custom_components/speedport/button.py @@ -4,7 +4,6 @@ from homeassistant.config_entries import ConfigEntry from homeassistant.core import HomeAssistant from homeassistant.helpers.entity_platform import AddEntitiesCallback -from homeassistant.helpers.typing import HomeAssistantType from speedport import Speedport from .const import DOMAIN @@ -29,7 +28,7 @@ async def async_setup_entry( class SpeedportReconnectButton(ButtonEntity, SpeedportEntity): _attr_device_class = ButtonDeviceClass.RESTART - def __init__(self, hass: HomeAssistantType, speedport: Speedport) -> None: + def __init__(self, hass: HomeAssistant, speedport: Speedport) -> None: """Initialize the button entity.""" super().__init__(hass, speedport) self._attr_name = "Reconnect" @@ -44,7 +43,7 @@ async def async_press(self) -> None: class SpeedportRebootButton(ButtonEntity, SpeedportEntity): _attr_device_class = ButtonDeviceClass.RESTART - def __init__(self, hass: HomeAssistantType, speedport: Speedport) -> None: + def __init__(self, hass: HomeAssistant, speedport: Speedport) -> None: """Initialize the button entity.""" super().__init__(hass, speedport) self._attr_name = "Reboot" @@ -59,7 +58,7 @@ async def async_press(self) -> None: class SpeedportWPSButton(ButtonEntity, SpeedportEntity): _attr_device_class = ButtonDeviceClass.IDENTIFY - def __init__(self, hass: HomeAssistantType, speedport: Speedport) -> None: + def __init__(self, hass: HomeAssistant, speedport: Speedport) -> None: """Initialize the button entity.""" super().__init__(hass, speedport) self._attr_name = "WPS on" @@ -68,4 +67,4 @@ def __init__(self, hass: HomeAssistantType, speedport: Speedport) -> None: async def async_press(self) -> None: """Send out a restart command.""" - await self._speedport.wps_on() + await self._speedport.wps_on() \ No newline at end of file diff --git a/custom_components/speedport/device.py b/custom_components/speedport/device.py index a8bf12d..7e43f1a 100644 --- a/custom_components/speedport/device.py +++ b/custom_components/speedport/device.py @@ -3,8 +3,8 @@ from datetime import timedelta from homeassistant.core import callback +from homeassistant.core import HomeAssistant from homeassistant.helpers.device_registry import DeviceInfo -from homeassistant.helpers.typing import HomeAssistantType from homeassistant.helpers.update_coordinator import ( DataUpdateCoordinator, CoordinatorEntity, @@ -17,7 +17,7 @@ class SpeedportCoordinator(DataUpdateCoordinator[None]): - def __init__(self, hass: HomeAssistantType, device: Speedport): + def __init__(self, hass: HomeAssistant, device: Speedport): """Initialize my coordinator.""" super().__init__( @@ -38,7 +38,7 @@ class SpeedportEntity(CoordinatorEntity[SpeedportCoordinator]): _attr_has_entity_name = True def __init__( - self, hass: HomeAssistantType, speedport: Speedport, description=None + self, hass: HomeAssistant, speedport: Speedport, description=None ) -> None: coordinator = get_coordinator(hass, speedport) super().__init__(coordinator) @@ -66,7 +66,7 @@ def _handle_coordinator_update(self) -> None: def get_coordinator( - hass: HomeAssistantType, speedport: Speedport + hass: HomeAssistant, speedport: Speedport ) -> SpeedportCoordinator: coordinators = hass.data[DOMAIN]["coordinators"] if speedport.serial_number in coordinators: @@ -76,4 +76,4 @@ def get_coordinator( else: coordinator = SpeedportCoordinator(hass, speedport) hass.data[DOMAIN]["coordinators"][speedport.serial_number] = coordinator - return coordinator + return coordinator \ No newline at end of file diff --git a/custom_components/speedport/switch.py b/custom_components/speedport/switch.py index ab5c800..6a3f1ea 100644 --- a/custom_components/speedport/switch.py +++ b/custom_components/speedport/switch.py @@ -7,7 +7,6 @@ from homeassistant.config_entries import ConfigEntry from homeassistant.core import HomeAssistant from homeassistant.helpers.entity_platform import AddEntitiesCallback -from homeassistant.helpers.typing import HomeAssistantType from speedport import Speedport from .const import DOMAIN @@ -34,7 +33,7 @@ async def async_setup_entry( class SpeedportWifiSwitch(SwitchEntity, SpeedportEntity): _attr_is_on: bool | None = False - def __init__(self, hass: HomeAssistantType, speedport: Speedport) -> None: + def __init__(self, hass: HomeAssistant, speedport: Speedport) -> None: super().__init__(hass, speedport) self._speedport: Speedport = speedport self._attr_icon = "mdi:wifi" @@ -57,7 +56,7 @@ async def async_turn_off(self, **kwargs: Any) -> None: class SpeedportGuestWifiSwitch(SwitchEntity, SpeedportEntity): _attr_is_on: bool | None = False - def __init__(self, hass: HomeAssistantType, speedport: Speedport) -> None: + def __init__(self, hass: HomeAssistant, speedport: Speedport) -> None: super().__init__(hass, speedport) self._speedport: Speedport = speedport self._attr_icon = "mdi:wifi" @@ -80,7 +79,7 @@ async def async_turn_off(self, **kwargs: Any) -> None: class SpeedportOfficeWifiSwitch(SwitchEntity, SpeedportEntity): _attr_is_on: bool | None = False - def __init__(self, hass: HomeAssistantType, speedport: Speedport) -> None: + def __init__(self, hass: HomeAssistant, speedport: Speedport) -> None: super().__init__(hass, speedport) self._speedport: Speedport = speedport self._attr_icon = "mdi:wifi" @@ -97,4 +96,4 @@ async def async_turn_on(self, **kwargs: Any) -> None: async def async_turn_off(self, **kwargs: Any) -> None: """Turn off switch.""" - await self._speedport.wifi_office_off() + await self._speedport.wifi_office_off() \ No newline at end of file From 24f32ebc3614bbf763d5c927b54c1736444c3758 Mon Sep 17 00:00:00 2001 From: Marc Date: Thu, 22 Aug 2024 20:27:26 +0200 Subject: [PATCH 2/2] Python Black Style Use Python Black Style --- custom_components/speedport/button.py | 2 +- custom_components/speedport/device.py | 6 ++---- custom_components/speedport/switch.py | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/custom_components/speedport/button.py b/custom_components/speedport/button.py index 98a8672..7343098 100644 --- a/custom_components/speedport/button.py +++ b/custom_components/speedport/button.py @@ -67,4 +67,4 @@ def __init__(self, hass: HomeAssistant, speedport: Speedport) -> None: async def async_press(self) -> None: """Send out a restart command.""" - await self._speedport.wps_on() \ No newline at end of file + await self._speedport.wps_on() diff --git a/custom_components/speedport/device.py b/custom_components/speedport/device.py index 7e43f1a..2ed8aae 100644 --- a/custom_components/speedport/device.py +++ b/custom_components/speedport/device.py @@ -65,9 +65,7 @@ def _handle_coordinator_update(self) -> None: self.async_write_ha_state() -def get_coordinator( - hass: HomeAssistant, speedport: Speedport -) -> SpeedportCoordinator: +def get_coordinator(hass: HomeAssistant, speedport: Speedport) -> SpeedportCoordinator: coordinators = hass.data[DOMAIN]["coordinators"] if speedport.serial_number in coordinators: coordinator: SpeedportCoordinator = hass.data[DOMAIN]["coordinators"][ @@ -76,4 +74,4 @@ def get_coordinator( else: coordinator = SpeedportCoordinator(hass, speedport) hass.data[DOMAIN]["coordinators"][speedport.serial_number] = coordinator - return coordinator \ No newline at end of file + return coordinator diff --git a/custom_components/speedport/switch.py b/custom_components/speedport/switch.py index 6a3f1ea..d1b0922 100644 --- a/custom_components/speedport/switch.py +++ b/custom_components/speedport/switch.py @@ -96,4 +96,4 @@ async def async_turn_on(self, **kwargs: Any) -> None: async def async_turn_off(self, **kwargs: Any) -> None: """Turn off switch.""" - await self._speedport.wifi_office_off() \ No newline at end of file + await self._speedport.wifi_office_off()