Fix mqtt callback typing (#118104)

This commit is contained in:
Marc Mueller 2024-05-25 18:59:29 +02:00 committed by GitHub
parent 344bb568f4
commit 2f16c3aa80
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 6 deletions

View File

@ -77,7 +77,6 @@ from .const import (
) )
from .models import ( from .models import (
DATA_MQTT, DATA_MQTT,
AsyncMessageCallbackType,
MessageCallbackType, MessageCallbackType,
MqttData, MqttData,
PublishMessage, PublishMessage,
@ -184,7 +183,7 @@ async def async_publish(
async def async_subscribe( async def async_subscribe(
hass: HomeAssistant, hass: HomeAssistant,
topic: str, topic: str,
msg_callback: AsyncMessageCallbackType | MessageCallbackType, msg_callback: Callable[[ReceiveMessage], Coroutine[Any, Any, None] | None],
qos: int = DEFAULT_QOS, qos: int = DEFAULT_QOS,
encoding: str | None = DEFAULT_ENCODING, encoding: str | None = DEFAULT_ENCODING,
) -> CALLBACK_TYPE: ) -> CALLBACK_TYPE:
@ -832,7 +831,7 @@ class MQTT:
def _exception_message( def _exception_message(
self, self,
msg_callback: AsyncMessageCallbackType | MessageCallbackType, msg_callback: Callable[[ReceiveMessage], Coroutine[Any, Any, None] | None],
msg: ReceiveMessage, msg: ReceiveMessage,
) -> str: ) -> str:
"""Return a string with the exception message.""" """Return a string with the exception message."""
@ -844,7 +843,7 @@ class MQTT:
async def async_subscribe( async def async_subscribe(
self, self,
topic: str, topic: str,
msg_callback: AsyncMessageCallbackType | MessageCallbackType, msg_callback: Callable[[ReceiveMessage], Coroutine[Any, Any, None] | None],
qos: int, qos: int,
encoding: str | None = None, encoding: str | None = None,
) -> Callable[[], None]: ) -> Callable[[], None]:

View File

@ -5,7 +5,7 @@ from __future__ import annotations
from ast import literal_eval from ast import literal_eval
import asyncio import asyncio
from collections import deque from collections import deque
from collections.abc import Callable, Coroutine from collections.abc import Callable
from dataclasses import dataclass, field from dataclasses import dataclass, field
from enum import StrEnum from enum import StrEnum
import logging import logging
@ -70,7 +70,6 @@ class ReceiveMessage:
timestamp: float timestamp: float
type AsyncMessageCallbackType = Callable[[ReceiveMessage], Coroutine[Any, Any, None]]
type MessageCallbackType = Callable[[ReceiveMessage], None] type MessageCallbackType = Callable[[ReceiveMessage], None]