From 51d16202abc6e8b446f85022d22803935c4274ca Mon Sep 17 00:00:00 2001 From: jan iversen Date: Mon, 19 Jul 2021 14:14:09 +0200 Subject: [PATCH] Correct typing in control4 and activate mypy (#53156) * Correct typing and activate mypy. * Review comments.:wq --- homeassistant/components/control4/__init__.py | 10 ++++++---- homeassistant/components/control4/light.py | 8 +++++--- mypy.ini | 3 --- script/hassfest/mypy_config.py | 1 - 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/homeassistant/components/control4/__init__.py b/homeassistant/components/control4/__init__.py index 6e4af61e24b..b7806e665f3 100644 --- a/homeassistant/components/control4/__init__.py +++ b/homeassistant/components/control4/__init__.py @@ -1,4 +1,6 @@ """The Control4 integration.""" +from __future__ import annotations + import json import logging @@ -149,9 +151,9 @@ class Control4Entity(CoordinatorEntity): coordinator: DataUpdateCoordinator, name: str, idx: int, - device_name: str, - device_manufacturer: str, - device_model: str, + device_name: str | None, + device_manufacturer: str | None, + device_model: str | None, device_id: int, ) -> None: """Initialize a Control4 entity.""" @@ -174,7 +176,7 @@ class Control4Entity(CoordinatorEntity): @property def unique_id(self) -> str: """Return a unique ID.""" - return self._idx + return str(self._idx) @property def device_info(self): diff --git a/homeassistant/components/control4/light.py b/homeassistant/components/control4/light.py index 46fc35398fe..38eca233f27 100644 --- a/homeassistant/components/control4/light.py +++ b/homeassistant/components/control4/light.py @@ -1,4 +1,6 @@ """Platform for Control4 Lights.""" +from __future__ import annotations + import asyncio from datetime import timedelta import logging @@ -145,9 +147,9 @@ class Control4Light(Control4Entity, LightEntity): coordinator: DataUpdateCoordinator, name: str, idx: int, - device_name: str, - device_manufacturer: str, - device_model: str, + device_name: str | None, + device_manufacturer: str | None, + device_model: str | None, device_id: int, is_dimmer: bool, ) -> None: diff --git a/mypy.ini b/mypy.ini index f05daa919bd..ac94b19c446 100644 --- a/mypy.ini +++ b/mypy.ini @@ -1116,9 +1116,6 @@ ignore_errors = true [mypy-homeassistant.components.config.*] ignore_errors = true -[mypy-homeassistant.components.control4.*] -ignore_errors = true - [mypy-homeassistant.components.conversation.*] ignore_errors = true diff --git a/script/hassfest/mypy_config.py b/script/hassfest/mypy_config.py index 31e1390f1d4..88106d96c32 100644 --- a/script/hassfest/mypy_config.py +++ b/script/hassfest/mypy_config.py @@ -34,7 +34,6 @@ IGNORED_MODULES: Final[list[str]] = [ "homeassistant.components.cloud.*", "homeassistant.components.cloudflare.*", "homeassistant.components.config.*", - "homeassistant.components.control4.*", "homeassistant.components.conversation.*", "homeassistant.components.deconz.*", "homeassistant.components.demo.*",