From 1210897f83f044e00763637a69e848a189713e24 Mon Sep 17 00:00:00 2001 From: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Date: Sun, 28 Aug 2022 21:14:09 +0200 Subject: [PATCH] Update pylint to 2.15.0 (#77408) * Update pylint to 2.15.0 * Remove useless suppressions * Fix TypeVar name --- homeassistant/components/nextdns/__init__.py | 8 ++++---- homeassistant/components/nextdns/binary_sensor.py | 8 ++++---- homeassistant/components/nextdns/sensor.py | 12 ++++++------ homeassistant/components/nextdns/switch.py | 8 ++++---- homeassistant/components/switchmate/switch.py | 1 - homeassistant/helpers/template.py | 2 -- requirements_test.txt | 2 +- 7 files changed, 19 insertions(+), 22 deletions(-) diff --git a/homeassistant/components/nextdns/__init__.py b/homeassistant/components/nextdns/__init__.py index a92186f6f14..d3cf46828cd 100644 --- a/homeassistant/components/nextdns/__init__.py +++ b/homeassistant/components/nextdns/__init__.py @@ -46,10 +46,10 @@ from .const import ( UPDATE_INTERVAL_SETTINGS, ) -TCoordinatorData = TypeVar("TCoordinatorData", bound=NextDnsData) +CoordinatorDataT = TypeVar("CoordinatorDataT", bound=NextDnsData) -class NextDnsUpdateCoordinator(DataUpdateCoordinator[TCoordinatorData]): +class NextDnsUpdateCoordinator(DataUpdateCoordinator[CoordinatorDataT]): """Class to manage fetching NextDNS data API.""" def __init__( @@ -73,7 +73,7 @@ class NextDnsUpdateCoordinator(DataUpdateCoordinator[TCoordinatorData]): super().__init__(hass, _LOGGER, name=DOMAIN, update_interval=update_interval) - async def _async_update_data(self) -> TCoordinatorData: + async def _async_update_data(self) -> CoordinatorDataT: """Update data via internal method.""" try: async with timeout(10): @@ -81,7 +81,7 @@ class NextDnsUpdateCoordinator(DataUpdateCoordinator[TCoordinatorData]): except (ApiError, ClientConnectorError, InvalidApiKeyError) as err: raise UpdateFailed(err) from err - async def _async_update_data_internal(self) -> TCoordinatorData: + async def _async_update_data_internal(self) -> CoordinatorDataT: """Update data via library.""" raise NotImplementedError("Update method not implemented") diff --git a/homeassistant/components/nextdns/binary_sensor.py b/homeassistant/components/nextdns/binary_sensor.py index af80d14a89b..673ea1a53e4 100644 --- a/homeassistant/components/nextdns/binary_sensor.py +++ b/homeassistant/components/nextdns/binary_sensor.py @@ -18,23 +18,23 @@ from homeassistant.helpers.entity import EntityCategory from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.helpers.update_coordinator import CoordinatorEntity -from . import NextDnsConnectionUpdateCoordinator, TCoordinatorData +from . import CoordinatorDataT, NextDnsConnectionUpdateCoordinator from .const import ATTR_CONNECTION, DOMAIN PARALLEL_UPDATES = 1 @dataclass -class NextDnsBinarySensorRequiredKeysMixin(Generic[TCoordinatorData]): +class NextDnsBinarySensorRequiredKeysMixin(Generic[CoordinatorDataT]): """Mixin for required keys.""" - state: Callable[[TCoordinatorData, str], bool] + state: Callable[[CoordinatorDataT, str], bool] @dataclass class NextDnsBinarySensorEntityDescription( BinarySensorEntityDescription, - NextDnsBinarySensorRequiredKeysMixin[TCoordinatorData], + NextDnsBinarySensorRequiredKeysMixin[CoordinatorDataT], ): """NextDNS binary sensor entity description.""" diff --git a/homeassistant/components/nextdns/sensor.py b/homeassistant/components/nextdns/sensor.py index 62cd671835b..c59440d6220 100644 --- a/homeassistant/components/nextdns/sensor.py +++ b/homeassistant/components/nextdns/sensor.py @@ -26,7 +26,7 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.helpers.typing import StateType from homeassistant.helpers.update_coordinator import CoordinatorEntity -from . import NextDnsUpdateCoordinator, TCoordinatorData +from . import CoordinatorDataT, NextDnsUpdateCoordinator from .const import ( ATTR_DNSSEC, ATTR_ENCRYPTION, @@ -40,17 +40,17 @@ PARALLEL_UPDATES = 1 @dataclass -class NextDnsSensorRequiredKeysMixin(Generic[TCoordinatorData]): +class NextDnsSensorRequiredKeysMixin(Generic[CoordinatorDataT]): """Class for NextDNS entity required keys.""" coordinator_type: str - value: Callable[[TCoordinatorData], StateType] + value: Callable[[CoordinatorDataT], StateType] @dataclass class NextDnsSensorEntityDescription( SensorEntityDescription, - NextDnsSensorRequiredKeysMixin[TCoordinatorData], + NextDnsSensorRequiredKeysMixin[CoordinatorDataT], ): """NextDNS sensor entity description.""" @@ -348,7 +348,7 @@ async def async_setup_entry( class NextDnsSensor( - CoordinatorEntity[NextDnsUpdateCoordinator[TCoordinatorData]], SensorEntity + CoordinatorEntity[NextDnsUpdateCoordinator[CoordinatorDataT]], SensorEntity ): """Define an NextDNS sensor.""" @@ -356,7 +356,7 @@ class NextDnsSensor( def __init__( self, - coordinator: NextDnsUpdateCoordinator[TCoordinatorData], + coordinator: NextDnsUpdateCoordinator[CoordinatorDataT], description: NextDnsSensorEntityDescription, ) -> None: """Initialize.""" diff --git a/homeassistant/components/nextdns/switch.py b/homeassistant/components/nextdns/switch.py index c0a0973a24c..a0e8f15e44d 100644 --- a/homeassistant/components/nextdns/switch.py +++ b/homeassistant/components/nextdns/switch.py @@ -18,22 +18,22 @@ from homeassistant.helpers.entity import EntityCategory from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.helpers.update_coordinator import CoordinatorEntity -from . import NextDnsSettingsUpdateCoordinator, TCoordinatorData +from . import CoordinatorDataT, NextDnsSettingsUpdateCoordinator from .const import ATTR_SETTINGS, DOMAIN PARALLEL_UPDATES = 1 @dataclass -class NextDnsSwitchRequiredKeysMixin(Generic[TCoordinatorData]): +class NextDnsSwitchRequiredKeysMixin(Generic[CoordinatorDataT]): """Class for NextDNS entity required keys.""" - state: Callable[[TCoordinatorData], bool] + state: Callable[[CoordinatorDataT], bool] @dataclass class NextDnsSwitchEntityDescription( - SwitchEntityDescription, NextDnsSwitchRequiredKeysMixin[TCoordinatorData] + SwitchEntityDescription, NextDnsSwitchRequiredKeysMixin[CoordinatorDataT] ): """NextDNS switch entity description.""" diff --git a/homeassistant/components/switchmate/switch.py b/homeassistant/components/switchmate/switch.py index 7beb89f8de1..ecc5b9003b5 100644 --- a/homeassistant/components/switchmate/switch.py +++ b/homeassistant/components/switchmate/switch.py @@ -3,7 +3,6 @@ from __future__ import annotations from datetime import timedelta -# pylint: disable=import-error from switchmate import Switchmate import voluptuous as vol diff --git a/homeassistant/helpers/template.py b/homeassistant/helpers/template.py index 36f5dc9b22c..ea6b764a75a 100644 --- a/homeassistant/helpers/template.py +++ b/homeassistant/helpers/template.py @@ -199,8 +199,6 @@ class TupleWrapper(tuple, ResultWrapper): """Create a new tuple class.""" return super().__new__(cls, tuple(value)) - # pylint: disable=super-init-not-called - def __init__(self, value: tuple, *, render_result: str | None = None) -> None: """Initialize a new tuple class.""" self.render_result = render_result diff --git a/requirements_test.txt b/requirements_test.txt index 94a1e0c3120..d15431a1d85 100644 --- a/requirements_test.txt +++ b/requirements_test.txt @@ -13,7 +13,7 @@ freezegun==1.2.1 mock-open==1.4.0 mypy==0.971 pre-commit==2.20.0 -pylint==2.14.5 +pylint==2.15.0 pipdeptree==2.2.1 pytest-aiohttp==0.3.0 pytest-cov==3.0.0