Rename bound TypeVars (#70975)

This commit is contained in:
Marc Mueller 2022-04-28 13:19:51 +02:00 committed by GitHub
parent 9672cddb07
commit cdafbbe10f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 29 additions and 21 deletions

View file

@ -61,18 +61,20 @@ from .data import EventListenAddr, get_domain_data
PARALLEL_UPDATES = 0
_T = TypeVar("_T", bound="DlnaDmrEntity")
_DlnaDmrEntityT = TypeVar("_DlnaDmrEntityT", bound="DlnaDmrEntity")
_R = TypeVar("_R")
_P = ParamSpec("_P")
def catch_request_errors(
func: Callable[Concatenate[_T, _P], Awaitable[_R]]
) -> Callable[Concatenate[_T, _P], Coroutine[Any, Any, _R | None]]:
func: Callable[Concatenate[_DlnaDmrEntityT, _P], Awaitable[_R]]
) -> Callable[Concatenate[_DlnaDmrEntityT, _P], Coroutine[Any, Any, _R | None]]:
"""Catch UpnpError errors."""
@functools.wraps(func)
async def wrapper(self: _T, *args: _P.args, **kwargs: _P.kwargs) -> _R | None:
async def wrapper(
self: _DlnaDmrEntityT, *args: _P.args, **kwargs: _P.kwargs
) -> _R | None:
"""Catch UpnpError errors and check availability before and after request."""
if not self.available:
_LOGGER.warning(

View file

@ -9,18 +9,20 @@ from typing_extensions import Concatenate, ParamSpec
from . import EvilGeniusEntity
_T = TypeVar("_T", bound=EvilGeniusEntity)
_EvilGeniusEntityT = TypeVar("_EvilGeniusEntityT", bound=EvilGeniusEntity)
_R = TypeVar("_R")
_P = ParamSpec("_P")
def update_when_done(
func: Callable[Concatenate[_T, _P], Awaitable[_R]]
) -> Callable[Concatenate[_T, _P], Coroutine[Any, Any, _R]]:
func: Callable[Concatenate[_EvilGeniusEntityT, _P], Awaitable[_R]]
) -> Callable[Concatenate[_EvilGeniusEntityT, _P], Coroutine[Any, Any, _R]]:
"""Decorate function to trigger update when function is done."""
@wraps(func)
async def wrapper(self: _T, *args: _P.args, **kwargs: _P.kwargs) -> _R:
async def wrapper(
self: _EvilGeniusEntityT, *args: _P.args, **kwargs: _P.kwargs
) -> _R:
"""Wrap function."""
result = await func(self, *args, **kwargs)
await self.coordinator.async_request_refresh()

View file

@ -9,21 +9,23 @@ from homeassistant.exceptions import HomeAssistantError
from .entity import PlugwiseEntity
_P = ParamSpec("_P")
_PlugwiseEntityT = TypeVar("_PlugwiseEntityT", bound=PlugwiseEntity)
_R = TypeVar("_R")
_T = TypeVar("_T", bound=PlugwiseEntity)
_P = ParamSpec("_P")
def plugwise_command(
func: Callable[Concatenate[_T, _P], Awaitable[_R]]
) -> Callable[Concatenate[_T, _P], Coroutine[Any, Any, _R]]:
func: Callable[Concatenate[_PlugwiseEntityT, _P], Awaitable[_R]]
) -> Callable[Concatenate[_PlugwiseEntityT, _P], Coroutine[Any, Any, _R]]:
"""Decorate Plugwise calls that send commands/make changes to the device.
A decorator that wraps the passed in function, catches Plugwise errors,
and requests an coordinator update to update status of the devices asap.
"""
async def handler(self: _T, *args: _P.args, **kwargs: _P.kwargs) -> _R:
async def handler(
self: _PlugwiseEntityT, *args: _P.args, **kwargs: _P.kwargs
) -> _R:
try:
return await func(self, *args, **kwargs)
except PlugwiseException as error:

View file

@ -76,7 +76,7 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
),
)
_T = TypeVar("_T", bound="SonarrSensor")
_SonarrSensorT = TypeVar("_SonarrSensorT", bound="SonarrSensor")
_P = ParamSpec("_P")
@ -109,8 +109,8 @@ async def async_setup_entry(
def sonarr_exception_handler(
func: Callable[Concatenate[_T, _P], Awaitable[None]]
) -> Callable[Concatenate[_T, _P], Coroutine[Any, Any, None]]:
func: Callable[Concatenate[_SonarrSensorT, _P], Awaitable[None]]
) -> Callable[Concatenate[_SonarrSensorT, _P], Coroutine[Any, Any, None]]:
"""Decorate Sonarr calls to handle Sonarr exceptions.
A decorator that wraps the passed in function, catches Sonarr errors,
@ -118,7 +118,9 @@ def sonarr_exception_handler(
"""
@wraps(func)
async def wrapper(self: _T, *args: _P.args, **kwargs: _P.kwargs) -> None:
async def wrapper(
self: _SonarrSensorT, *args: _P.args, **kwargs: _P.kwargs
) -> None:
try:
await func(self, *args, **kwargs)
self.last_update_success = True

View file

@ -31,7 +31,7 @@ from .const import DATA_AVAILABLE, DATA_VLC, DEFAULT_NAME, DOMAIN, LOGGER
MAX_VOLUME = 500
_T = TypeVar("_T", bound="VlcDevice")
_VlcDeviceT = TypeVar("_VlcDeviceT", bound="VlcDevice")
_P = ParamSpec("_P")
@ -48,12 +48,12 @@ async def async_setup_entry(
def catch_vlc_errors(
func: Callable[Concatenate[_T, _P], Awaitable[None]]
) -> Callable[Concatenate[_T, _P], Coroutine[Any, Any, None]]:
func: Callable[Concatenate[_VlcDeviceT, _P], Awaitable[None]]
) -> Callable[Concatenate[_VlcDeviceT, _P], Coroutine[Any, Any, None]]:
"""Catch VLC errors."""
@wraps(func)
async def wrapper(self: _T, *args: _P.args, **kwargs: _P.kwargs) -> None:
async def wrapper(self: _VlcDeviceT, *args: _P.args, **kwargs: _P.kwargs) -> None:
"""Catch VLC errors and modify availability."""
try:
await func(self, *args, **kwargs)