Fix lint

Author: cyr-ius

custom_components/livebox/__init__.py

@@ -3,7 +3,6 @@
 import logging
 
 import voluptuous as vol
-
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
@@ -51,9 +50,7 @@ async def _async_update_listener(hass: HomeAssistant, entry: LiveboxConfigEntry)
 
 
 async def async_remove_config_entry_device(
-    hass: HomeAssistant,  # pylint: disable=unused-argument
-    config_entry: ConfigEntry,  # pylint: disable=unused-argument
-    device_entry: dr.DeviceEntry,  # pylint: disable=unused-argument
+    hass: HomeAssistant, config_entry: ConfigEntry, device_entry: dr.DeviceEntry
 ) -> bool:
     """Remove config entry from a device."""
     return True

custom_components/livebox/binary_sensor.py

@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-import logging
 from collections.abc import Callable
 from dataclasses import dataclass
 from datetime import datetime, timedelta
@@ -13,8 +12,8 @@
     BinarySensorEntity,
     BinarySensorEntityDescription,
 )
+from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity import EntityCategory
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from . import LiveboxConfigEntry
@@ -23,15 +22,13 @@
 from .entity import LiveboxEntity
 from .helpers import find_item
 
-_LOGGER = logging.getLogger(__name__)
 
-
-@dataclass(frozen=True)
+@dataclass(frozen=True, kw_only=True)
 class LiveboxBinarySensorEntityDescription(BinarySensorEntityDescription):
     """Represents an Flow Sensor."""
 
-    value_fn: Callable[..., Any] | None = None
-    attrs: dict[str, Callable[..., Any]] | None = None
+    value_fn: Callable[..., Any]
+    attrs: dict[str, Callable[..., Any]]
     index: int | None = None
 
 
@@ -111,6 +108,8 @@ async def async_setup_entry(
 class LiveboxBinarySensor(LiveboxEntity, BinarySensorEntity):
     """Livebox binary sensor."""
 
+    entity_description: LiveboxBinarySensorEntityDescription
+
     def __init__(
         self,
         coordinator: LiveboxDataUpdateCoordinator,

custom_components/livebox/button.py

@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-import logging
 from collections.abc import Callable
 from dataclasses import dataclass
 from typing import Any, Final
@@ -16,14 +15,12 @@
 from .coordinator import LiveboxDataUpdateCoordinator
 from .entity import LiveboxEntity
 
-_LOGGER = logging.getLogger(__name__)
 
-
-@dataclass(frozen=True)
+@dataclass(frozen=True, kw_only=True)
 class LiveboxButtonEntityDescription(ButtonEntityDescription):
     """Class describing Livebox button entities."""
 
-    value_fn: Callable[..., Any] | None = None
+    value_fn: Callable[..., Any]
 
 
 BUTTON_TYPES: Final[tuple[ButtonEntityDescription, ...]] = (
@@ -32,21 +29,21 @@ class LiveboxButtonEntityDescription(ButtonEntityDescription):
         name="Livebox restart",
         icon=RESTART_ICON,
         translation_key="restart_btn",
-        value_fn=lambda x: getattr(getattr(x, "nmc"), "async_reboot"),
+        value_fn=lambda x: x.nmc.async_reboot,
     ),
     LiveboxButtonEntityDescription(
         key="ring",
         name="Ring your phone",
         icon=RING_ICON,
         translation_key="ring_btn",
-        value_fn=lambda x: getattr(getattr(x, "voiceservice"), "async_ring"),
+        value_fn=lambda x: x.voiceservice.async_ring,
     ),
     LiveboxButtonEntityDescription(
         key="clear_calls",
         name="Clear calls",
         icon=CLEARCALLS_ICON,
         translation_key="cmissed_clear_btn",
-        value_fn=lambda x: getattr(getattr(x, "voiceservice"), "async_clear_calllist"),
+        value_fn=lambda x: x.voiceservice.async_clear_calllist,
     ),
 )
 
@@ -66,14 +63,15 @@ class Button(LiveboxEntity, ButtonEntity):
     """Representation of a livebox button."""
 
     _attr_should_poll = False
+    entity_description: LiveboxButtonEntityDescription
 
     def __init__(
         self,
         coordinator: LiveboxDataUpdateCoordinator,
-        entity_description: LiveboxButtonEntityDescription,
+        description: LiveboxButtonEntityDescription,
     ) -> None:
         """Initialize."""
-        super().__init__(coordinator, entity_description)
+        super().__init__(coordinator, description)
 
     async def async_press(self) -> None:
         """Triggers the button press service."""

custom_components/livebox/config_flow.py

@@ -2,11 +2,10 @@
 
 from __future__ import annotations
 
-import logging
 from collections.abc import Mapping
+import logging
 from typing import Any
 
-import voluptuous as vol
 from aiosysbus import AIOSysbus
 from aiosysbus.exceptions import (
     AiosysbusException,
@@ -15,11 +14,12 @@
     InsufficientPermissionsError,
     RetrieveFailed,
 )
+import voluptuous as vol
+
 from homeassistant import config_entries
-from homeassistant.config_entries import ConfigEntry
+from homeassistant.config_entries import ConfigEntry, ConfigFlowResult
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_PORT, CONF_USERNAME
 from homeassistant.core import callback
-from homeassistant.data_entry_flow import FlowResult
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_create_clientsession
 from homeassistant.helpers.service_info.ssdp import ATTR_UPNP_SERIAL, SsdpServiceInfo
@@ -66,13 +66,13 @@ def async_get_options_flow(config_entry: ConfigEntry):
         """Get option flow."""
         return LiveboxOptionsFlowHandler()
 
-    async def async_step_import(self, import_config) -> FlowResult:
+    async def async_step_import(self, import_config) -> ConfigFlowResult:
         """Import a config entry from configuration.yaml."""
         return await self.async_step_user(import_config)
 
     async def async_step_user(
         self, user_input: Mapping[str, Any] | None = None
-    ) -> FlowResult:
+    ) -> ConfigFlowResult:
         """Handle a flow initialized by the user."""
         errors = {}
         if user_input:
@@ -122,7 +122,9 @@ async def async_step_user(
             step_id="user", data_schema=DATA_SCHEMA, errors=errors
         )
 
-    async def async_step_ssdp(self, discovery_info: SsdpServiceInfo) -> FlowResult:
+    async def async_step_ssdp(
+        self, discovery_info: SsdpServiceInfo
+    ) -> ConfigFlowResult:
         """Handle a discovered device."""
         unique_id = discovery_info.upnp[ATTR_UPNP_SERIAL]
         await self.async_set_unique_id(unique_id)
@@ -135,7 +137,7 @@ class LiveboxOptionsFlowHandler(config_entries.OptionsFlow):
 
     async def async_step_init(
         self, user_input: Mapping[str, Any] | None = None
-    ) -> FlowResult:
+    ) -> ConfigFlowResult:
         """Handle a flow initialized by the user."""
         if user_input:
             return self.async_create_entry(title="", data=user_input)

custom_components/livebox/coordinator.py

@@ -2,13 +2,14 @@
 
 from __future__ import annotations
 
-import logging
 from collections.abc import Callable
 from datetime import datetime, timedelta
+import logging
 from typing import Any
 
 from aiosysbus import AIOSysbus
 from aiosysbus.exceptions import AiosysbusException
+
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_PORT, CONF_USERNAME
 from homeassistant.core import HomeAssistant
@@ -36,6 +37,9 @@
 class LiveboxDataUpdateCoordinator(DataUpdateCoordinator):
     """Define an object to fetch data."""
 
+    unique_id: str
+    model: int | float
+
     def __init__(
         self,
         hass: HomeAssistant,
@@ -44,16 +48,17 @@ def __init__(
         """Class to manage fetching data API."""
         super().__init__(hass, _LOGGER, name=DOMAIN, update_interval=SCAN_INTERVAL)
         self.config_entry = config_entry
+
+    async def _async_setup(self) -> None:
+        """Coordinator setup."""
         self.api = AIOSysbus(
-            username=config_entry.data[CONF_USERNAME],
-            password=config_entry.data[CONF_PASSWORD],
-            session=async_create_clientsession(hass),
-            host=config_entry.data[CONF_HOST],
-            port=config_entry.data[CONF_PORT],
-            use_tls=config_entry.data.get(CONF_USE_TLS, False),
+            username=self.config_entry.data[CONF_USERNAME],
+            password=self.config_entry.data[CONF_PASSWORD],
+            session=async_create_clientsession(self.hass),
+            host=self.config_entry.data[CONF_HOST],
+            port=self.config_entry.data[CONF_PORT],
+            use_tls=self.config_entry.data.get(CONF_USE_TLS, False),
         )
-        self.unique_id: str | None = None
-        self.model: int | float | None = None
 
     async def _async_update_data(self) -> dict[str, Any]:
         """Fetch data."""
@@ -122,8 +127,7 @@ async def _async_update_data(self) -> dict[str, Any]:
 
     async def async_get_infos(self) -> dict[str, Any]:
         """Get router infos."""
-        infos = (await self.api.deviceinfo.async_get_deviceinfo()).get("status", {})
-        return infos
+        return (await self.api.deviceinfo.async_get_deviceinfo()).get("status", {})
 
     async def async_get_devices(
         self, lan_tracking=False, wifi_tracking=True
@@ -166,7 +170,9 @@ async def async_get_devices(
 
         return devices_tracker, device_counters
 
-    async def async_get_callers(self) -> tuple(list[dict[str, Any] | None]):
+    async def async_get_callers(
+        self,
+    ) -> tuple[list[dict[str, Any] | None], list[dict[str, Any] | None]]:
         """Get caller missed."""
         callers = []
         cmisseds = []
@@ -235,9 +241,9 @@ async def async_get_lan(self, lan_devices):
         ).get("status", {})
 
         devices = []
-        for type, items in self_devices.items():
+        for mode, items in self_devices.items():
             for item in items:
-                if type == "wifi":
+                if mode == "wifi":
                     intf = item.get("Name", "Unknown")
                     band = item.get("OperatingFrequencyBand", intf)
                     ess_identifier = item.get("EssIdentifier", "guest").lower()
@@ -255,7 +261,7 @@ async def async_get_lan(self, lan_devices):
                             },
                         }
                     )
-                if type == "eth":
+                if mode == "eth":
                     devices.append(
                         {
                             "name": item.get("Name", "Unknown"),
@@ -272,10 +278,9 @@ async def async_get_lan(self, lan_devices):
 
     async def async_get_wifi_stats(self) -> bool:
         """Get wifi stats."""
-        stats = (await self._make_request(self.api.nmc.async_get_wifi_stats)).get(
+        return (await self._make_request(self.api.nmc.async_get_wifi_stats)).get(
             "data", {}
         )
-        return stats
 
     async def async_get_fiber_stats(self) -> bool:
         """Get fiber stats."""
@@ -285,22 +290,19 @@ async def async_get_fiber_stats(self) -> bool:
             intf = "bridge_vmulti"
         else:
             intf = "veip0"
-        stats = (
+        return (
             await self._make_request(self.api.nemo.async_get_net_dev_stats, intf)
         ).get("status", {})
-        return stats
 
     async def async_get_wan_status(self) -> dict[str, Any]:
         """Get status."""
-        wan_status = (await self._make_request(self.api.nmc.async_get_wan_status)).get(
+        return (await self._make_request(self.api.nmc.async_get_wan_status)).get(
             "data", {}
         )
-        return wan_status
 
     async def async_get_nmc(self) -> dict[str, Any]:
         """Get dsl status."""
-        nmc = (await self._make_request(self.api.nmc.async_get)).get("status", {})
-        return nmc
+        return (await self._make_request(self.api.nmc.async_get)).get("status", {})
 
     async def async_is_wifi(self) -> bool:
         """Get wireless status."""
@@ -373,19 +375,17 @@ async def async_get_dhcp_leases(
         data = (
             await self._make_request(self.api.dhcp.async_get_dhcp_leases, None, domain)
         ).get("status", {})
-        leases = []
-        for item in data.get(domain, {}).values():
-            leases.append(
-                {
-                    "IP Address": item.get("IPAddress"),
-                    "Mac Address": item.get("MACAddress"),
-                    "Name": item.get("FriendlyName", "No name"),
-                    "Time (s)": item.get("LeaseTime"),
-                    "Enable": item.get("Active"),
-                    "Reserved": item.get("Reserved"),
-                }
-            )
-        return leases
+        return [
+            {
+                "IP Address": item.get("IPAddress"),
+                "Mac Address": item.get("MACAddress"),
+                "Name": item.get("FriendlyName", "No name"),
+                "Time (s)": item.get("LeaseTime"),
+                "Enable": item.get("Active"),
+                "Reserved": item.get("Reserved"),
+            }
+            for item in data.get(domain, {}).values()
+        ]
 
     async def async_get_results(self) -> dict[str, Any]:
         """Get interfaces."""