home-assistant/core
1
0
Fork 1
mirror of https://github.com/home-assistant/core.git synced 2025-07-31 19:25:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactor MQTT to replace get_mqtt_data with HassKey (#117899)

Browse Source
This commit is contained in:
J. Nick Koston
2024-05-21 23:21:51 -10:00
committed by GitHub
parent b4d0562063
commit 4e3c4400a7
14 changed files with 74 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
homeassistant/components/mqtt/client.py
View File

@@ -66,6 +66,7 @@ from .const import (
TRANSPORT_WEBSOCKETS,
)
from .models import (
DATA_MQTT,
AsyncMessageCallbackType,
MessageCallbackType,
MqttData,
@@ -73,7 +74,7 @@ from .models import (
PublishPayloadType,
ReceiveMessage,
)
from .util import get_file_path, get_mqtt_data, mqtt_config_entry_enabled
from .util import get_file_path, mqtt_config_entry_enabled
if TYPE_CHECKING:
# Only import for paho-mqtt type checking here, imports are done locally
@@ -132,7 +133,7 @@ async def async_publish(
translation_domain=DOMAIN,
translation_placeholders={"topic": topic},
)
mqtt_data = get_mqtt_data(hass)
mqtt_data = hass.data[DATA_MQTT]
outgoing_payload = payload
if not isinstance(payload, bytes):
if not encoding:
@@ -186,7 +187,7 @@ async def async_subscribe(
translation_placeholders={"topic": topic},
)
try:
mqtt_data = get_mqtt_data(hass)
mqtt_data = hass.data[DATA_MQTT]
except KeyError as exc:
raise HomeAssistantError(
f"Cannot subscribe to topic '{topic}', "