From 750b48dcaf109b854be804371d4bdef23bd7fc1a Mon Sep 17 00:00:00 2001
From: Erik Montnemery <erik@montnemery.com>
Date: Thu, 17 Feb 2022 20:12:12 +0100
Subject: [PATCH] Use pylint disable-next in MQTT (#66758)
---
homeassistant/components/mqtt/__init__.py | 8 ++++----
homeassistant/components/mqtt/config_flow.py | 2 +-
homeassistant/components/mqtt/discovery.py | 4 ++--
homeassistant/components/mqtt/mixins.py | 7 ++-----
4 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/homeassistant/components/mqtt/__init__.py b/homeassistant/components/mqtt/__init__.py
index 7c3bc63779b..3da9a17c3aa 100644
--- a/homeassistant/components/mqtt/__init__.py
+++ b/homeassistant/components/mqtt/__init__.py
@@ -895,7 +895,7 @@ class MQTT:
async def async_connect(self) -> None:
"""Connect to the host. Does not process messages yet."""
- # pylint: disable=import-outside-toplevel
+ # pylint: disable-next=import-outside-toplevel
import paho.mqtt.client as mqtt
result: int | None = None
@@ -1000,7 +1000,7 @@ class MQTT:
Resubscribe to all topics we were subscribed to and publish birth
message.
"""
- # pylint: disable=import-outside-toplevel
+ # pylint: disable-next=import-outside-toplevel
import paho.mqtt.client as mqtt
if result_code != mqtt.CONNACK_ACCEPTED:
@@ -1159,7 +1159,7 @@ class MQTT:
def _raise_on_error(result_code: int | None) -> None:
"""Raise error if error result."""
- # pylint: disable=import-outside-toplevel
+ # pylint: disable-next=import-outside-toplevel
import paho.mqtt.client as mqtt
if result_code is not None and result_code != 0:
@@ -1169,7 +1169,7 @@ def _raise_on_error(result_code: int | None) -> None:
def _matcher_for_topic(subscription: str) -> Any:
- # pylint: disable=import-outside-toplevel
+ # pylint: disable-next=import-outside-toplevel
from paho.mqtt.matcher import MQTTMatcher
matcher = MQTTMatcher()
diff --git a/homeassistant/components/mqtt/config_flow.py b/homeassistant/components/mqtt/config_flow.py
index a26e62b6227..23e2a0d1e81 100644
--- a/homeassistant/components/mqtt/config_flow.py
+++ b/homeassistant/components/mqtt/config_flow.py
@@ -313,7 +313,7 @@ class MQTTOptionsFlowHandler(config_entries.OptionsFlow):
def try_connection(broker, port, username, password, protocol="3.1"):
"""Test if we can connect to an MQTT broker."""
- # pylint: disable=import-outside-toplevel
+ # pylint: disable-next=import-outside-toplevel
import paho.mqtt.client as mqtt
if protocol == "3.1":
diff --git a/homeassistant/components/mqtt/discovery.py b/homeassistant/components/mqtt/discovery.py
index b31d90c76f8..11bc0f6839a 100644
--- a/homeassistant/components/mqtt/discovery.py
+++ b/homeassistant/components/mqtt/discovery.py
@@ -228,13 +228,13 @@ async def async_start( # noqa: C901
if config_entries_key not in hass.data[CONFIG_ENTRY_IS_SETUP]:
if component == "device_automation":
# Local import to avoid circular dependencies
- # pylint: disable=import-outside-toplevel
+ # pylint: disable-next=import-outside-toplevel
from . import device_automation
await device_automation.async_setup_entry(hass, config_entry)
elif component == "tag":
# Local import to avoid circular dependencies
- # pylint: disable=import-outside-toplevel
+ # pylint: disable-next=import-outside-toplevel
from . import tag
await tag.async_setup_entry(hass, config_entry)
diff --git a/homeassistant/components/mqtt/mixins.py b/homeassistant/components/mqtt/mixins.py
index 421ad3203b3..fb25fa1e1b6 100644
--- a/homeassistant/components/mqtt/mixins.py
+++ b/homeassistant/components/mqtt/mixins.py
@@ -420,10 +420,7 @@ class MqttAvailability(Entity):
CONF_AVAILABILITY_TEMPLATE: avail.get(CONF_VALUE_TEMPLATE),
}
- for (
- topic, # pylint: disable=unused-variable
- avail_topic_conf,
- ) in self._avail_topics.items():
+ for avail_topic_conf in self._avail_topics.values():
avail_topic_conf[CONF_AVAILABILITY_TEMPLATE] = MqttValueTemplate(
avail_topic_conf[CONF_AVAILABILITY_TEMPLATE],
entity=self,
@@ -502,7 +499,7 @@ class MqttAvailability(Entity):
async def cleanup_device_registry(hass, device_id):
"""Remove device registry entry if there are no remaining entities or triggers."""
# Local import to avoid circular dependencies
- # pylint: disable=import-outside-toplevel
+ # pylint: disable-next=import-outside-toplevel
from . import device_trigger, tag
device_registry = dr.async_get(hass)
--
GitLab