From bcb93d95bbacded427cdd80904a1bbf6557e0f84 Mon Sep 17 00:00:00 2001 From: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Date: Tue, 11 Jan 2022 21:26:45 +0100 Subject: [PATCH] Update typing (4) [u-z] (#63925) --- homeassistant/components/upcloud/__init__.py | 4 ++-- homeassistant/components/wallbox/__init__.py | 4 ++-- homeassistant/components/websocket_api/const.py | 6 +++--- homeassistant/components/wemo/__init__.py | 4 ++-- homeassistant/components/withings/common.py | 6 +++--- homeassistant/components/wled/light.py | 4 ++-- homeassistant/components/zamg/sensor.py | 4 ++-- homeassistant/components/zha/core/channels/__init__.py | 4 ++-- homeassistant/components/zwave_js/select.py | 4 ++-- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/homeassistant/components/upcloud/__init__.py b/homeassistant/components/upcloud/__init__.py index bbce9cd5304..a4901dcf2d2 100644 --- a/homeassistant/components/upcloud/__init__.py +++ b/homeassistant/components/upcloud/__init__.py @@ -4,7 +4,7 @@ from __future__ import annotations import dataclasses from datetime import timedelta import logging -from typing import Any, Dict +from typing import Any import requests.exceptions import upcloud_api @@ -55,7 +55,7 @@ STATE_MAP = {"error": STATE_PROBLEM, "started": STATE_ON, "stopped": STATE_OFF} class UpCloudDataUpdateCoordinator( - DataUpdateCoordinator[Dict[str, upcloud_api.Server]] + DataUpdateCoordinator[dict[str, upcloud_api.Server]] ): """UpCloud data update coordinator.""" diff --git a/homeassistant/components/wallbox/__init__.py b/homeassistant/components/wallbox/__init__.py index f8646d7d664..f1ce91a5bdf 100644 --- a/homeassistant/components/wallbox/__init__.py +++ b/homeassistant/components/wallbox/__init__.py @@ -4,7 +4,7 @@ from __future__ import annotations from datetime import timedelta from http import HTTPStatus import logging -from typing import Any, Dict +from typing import Any import requests from wallbox import Wallbox @@ -37,7 +37,7 @@ PLATFORMS = [Platform.SENSOR, Platform.NUMBER] UPDATE_INTERVAL = 30 -class WallboxCoordinator(DataUpdateCoordinator[Dict[str, Any]]): +class WallboxCoordinator(DataUpdateCoordinator[dict[str, Any]]): """Wallbox Coordinator class.""" def __init__(self, station: str, wallbox: Wallbox, hass: HomeAssistant) -> None: diff --git a/homeassistant/components/websocket_api/const.py b/homeassistant/components/websocket_api/const.py index 69716b97076..6e59a1dc01e 100644 --- a/homeassistant/components/websocket_api/const.py +++ b/homeassistant/components/websocket_api/const.py @@ -5,7 +5,7 @@ import asyncio from concurrent import futures from functools import partial import json -from typing import TYPE_CHECKING, Any, Awaitable, Callable, Dict, Final +from typing import TYPE_CHECKING, Any, Awaitable, Callable, Final from homeassistant.core import HomeAssistant from homeassistant.helpers.json import JSONEncoder @@ -15,10 +15,10 @@ if TYPE_CHECKING: WebSocketCommandHandler = Callable[ - [HomeAssistant, "ActiveConnection", Dict[str, Any]], None + [HomeAssistant, "ActiveConnection", dict[str, Any]], None ] AsyncWebSocketCommandHandler = Callable[ - [HomeAssistant, "ActiveConnection", Dict[str, Any]], Awaitable[None] + [HomeAssistant, "ActiveConnection", dict[str, Any]], Awaitable[None] ] DOMAIN: Final = "websocket_api" diff --git a/homeassistant/components/wemo/__init__.py b/homeassistant/components/wemo/__init__.py index 31a34befda8..b847e2ac855 100644 --- a/homeassistant/components/wemo/__init__.py +++ b/homeassistant/components/wemo/__init__.py @@ -4,7 +4,7 @@ from __future__ import annotations from collections.abc import Sequence from datetime import datetime import logging -from typing import Optional, Tuple +from typing import Optional import pywemo import voluptuous as vol @@ -43,7 +43,7 @@ WEMO_MODEL_DISPATCH = { _LOGGER = logging.getLogger(__name__) -HostPortTuple = Tuple[str, Optional[int]] +HostPortTuple = tuple[str, Optional[int]] def coerce_host_port(value: str) -> HostPortTuple: diff --git a/homeassistant/components/withings/common.py b/homeassistant/components/withings/common.py index 608f20a4fb3..8da67a0b77a 100644 --- a/homeassistant/components/withings/common.py +++ b/homeassistant/components/withings/common.py @@ -10,7 +10,7 @@ from enum import Enum, IntEnum from http import HTTPStatus import logging import re -from typing import Any, Dict +from typing import Any from aiohttp.web import Response import requests @@ -63,7 +63,7 @@ NOT_AUTHENTICATED_ERROR = re.compile( ) DATA_UPDATED_SIGNAL = "withings_entity_state_updated" -MeasurementData = Dict[Measurement, Any] +MeasurementData = dict[Measurement, Any] class NotAuthenticatedError(HomeAssistantError): @@ -588,7 +588,7 @@ class DataManager: update_method=self.async_subscribe_webhook, ) self.poll_data_update_coordinator = DataUpdateCoordinator[ - Dict[MeasureType, Any] + dict[MeasureType, Any] ]( hass, _LOGGER, diff --git a/homeassistant/components/wled/light.py b/homeassistant/components/wled/light.py index b42c7b0a8b4..b30e20810d9 100644 --- a/homeassistant/components/wled/light.py +++ b/homeassistant/components/wled/light.py @@ -2,7 +2,7 @@ from __future__ import annotations from functools import partial -from typing import Any, Tuple, cast +from typing import Any, cast from homeassistant.components.light import ( ATTR_BRIGHTNESS, @@ -154,7 +154,7 @@ class WLEDSegmentLight(WLEDEntity, LightEntity): def rgbw_color(self) -> tuple[int, int, int, int] | None: """Return the color value.""" return cast( - Tuple[int, int, int, int], + tuple[int, int, int, int], self.coordinator.data.state.segments[self._segment].color_primary, ) diff --git a/homeassistant/components/zamg/sensor.py b/homeassistant/components/zamg/sensor.py index 9a695b8ab84..87a1175b7cd 100644 --- a/homeassistant/components/zamg/sensor.py +++ b/homeassistant/components/zamg/sensor.py @@ -8,7 +8,7 @@ import gzip import json import logging import os -from typing import Type, Union +from typing import Union from aiohttp.hdrs import USER_AGENT import requests @@ -53,7 +53,7 @@ DEFAULT_NAME = "zamg" MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=10) VIENNA_TIME_ZONE = dt_util.get_time_zone("Europe/Vienna") -DTypeT = Union[Type[int], Type[float], Type[str]] +DTypeT = Union[type[int], type[float], type[str]] @dataclass diff --git a/homeassistant/components/zha/core/channels/__init__.py b/homeassistant/components/zha/core/channels/__init__.py index 3661d3b17d9..d60c38c69a6 100644 --- a/homeassistant/components/zha/core/channels/__init__.py +++ b/homeassistant/components/zha/core/channels/__init__.py @@ -2,7 +2,7 @@ from __future__ import annotations import asyncio -from typing import Any, Dict +from typing import Any import zigpy.zcl.clusters.closures @@ -32,7 +32,7 @@ from .. import ( typing as zha_typing, ) -ChannelsDict = Dict[str, zha_typing.ChannelType] +ChannelsDict = dict[str, zha_typing.ChannelType] class Channels: diff --git a/homeassistant/components/zwave_js/select.py b/homeassistant/components/zwave_js/select.py index 206ba8bee5e..c6bc11a4804 100644 --- a/homeassistant/components/zwave_js/select.py +++ b/homeassistant/components/zwave_js/select.py @@ -1,7 +1,7 @@ """Support for Z-Wave controls using the select platform.""" from __future__ import annotations -from typing import Dict, cast +from typing import cast from zwave_js_server.client import Client as ZwaveClient from zwave_js_server.const import TARGET_VALUE_PROPERTY, CommandClass @@ -150,7 +150,7 @@ class ZwaveMultilevelSwitchSelectEntity(ZWaveBaseEntity, SelectEntity): self._target_value = self.get_zwave_value(TARGET_VALUE_PROPERTY) assert self.info.platform_data_template self._lookup_map = cast( - Dict[int, str], self.info.platform_data_template.static_data + dict[int, str], self.info.platform_data_template.static_data ) # Entity class attributes