diff --git a/homeassistant/components/automation/__init__.py b/homeassistant/components/automation/__init__.py index 1aefeff5d6b..be440e8cf88 100644 --- a/homeassistant/components/automation/__init__.py +++ b/homeassistant/components/automation/__init__.py @@ -40,8 +40,9 @@ from homeassistant.exceptions import ( ConditionErrorContainer, ConditionErrorIndex, HomeAssistantError, + TemplateError, ) -from homeassistant.helpers import condition, extract_domain_configs, template +from homeassistant.helpers import condition, extract_domain_configs import homeassistant.helpers.config_validation as cv from homeassistant.helpers.entity import ToggleEntity from homeassistant.helpers.entity_component import EntityComponent @@ -457,7 +458,7 @@ class AutomationEntity(ToggleEntity, RestoreEntity): if self._variables: try: variables = self._variables.async_render(self.hass, variables) - except template.TemplateError as err: + except TemplateError as err: self._logger.error("Error rendering variables: %s", err) automation_trace.set_error(err) return @@ -589,7 +590,7 @@ class AutomationEntity(ToggleEntity, RestoreEntity): variables, limited=True, ) - except template.TemplateError as err: + except TemplateError as err: self._logger.error("Error rendering trigger variables: %s", err) return None diff --git a/homeassistant/components/azure_event_hub/__init__.py b/homeassistant/components/azure_event_hub/__init__.py index 71d4d7c2cc4..52e07063569 100644 --- a/homeassistant/components/azure_event_hub/__init__.py +++ b/homeassistant/components/azure_event_hub/__init__.py @@ -13,9 +13,10 @@ from azure.eventhub.aio import EventHubProducerClient from azure.eventhub.exceptions import EventHubError import voluptuous as vol -from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry, ConfigEntryNotReady +from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry from homeassistant.const import MATCH_ALL from homeassistant.core import Event, HomeAssistant, State +from homeassistant.exceptions import ConfigEntryNotReady import homeassistant.helpers.config_validation as cv from homeassistant.helpers.entityfilter import FILTER_SCHEMA from homeassistant.helpers.event import async_call_later diff --git a/homeassistant/components/nam/__init__.py b/homeassistant/components/nam/__init__.py index f9e625bfe16..53788477c48 100644 --- a/homeassistant/components/nam/__init__.py +++ b/homeassistant/components/nam/__init__.py @@ -20,16 +20,12 @@ from homeassistant.components.air_quality import DOMAIN as AIR_QUALITY_PLATFORM from homeassistant.config_entries import ConfigEntry from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME, Platform from homeassistant.core import HomeAssistant +from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady from homeassistant.helpers import entity_registry from homeassistant.helpers.aiohttp_client import async_get_clientsession from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC from homeassistant.helpers.entity import DeviceInfo -from homeassistant.helpers.update_coordinator import ( - ConfigEntryAuthFailed, - ConfigEntryNotReady, - DataUpdateCoordinator, - UpdateFailed, -) +from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed from .const import ( ATTR_SDS011, diff --git a/homeassistant/components/samsungtv/__init__.py b/homeassistant/components/samsungtv/__init__.py index 4cbd661f113..212ef6c23ca 100644 --- a/homeassistant/components/samsungtv/__init__.py +++ b/homeassistant/components/samsungtv/__init__.py @@ -9,7 +9,7 @@ import getmac import voluptuous as vol from homeassistant import config_entries -from homeassistant.config_entries import ConfigEntry, ConfigEntryNotReady +from homeassistant.config_entries import ConfigEntry from homeassistant.const import ( CONF_HOST, CONF_MAC, @@ -21,6 +21,7 @@ from homeassistant.const import ( Platform, ) from homeassistant.core import Event, HomeAssistant, callback +from homeassistant.exceptions import ConfigEntryNotReady import homeassistant.helpers.config_validation as cv from homeassistant.helpers.typing import ConfigType diff --git a/homeassistant/components/tplink/__init__.py b/homeassistant/components/tplink/__init__.py index 70e5292f6ea..c2ada4190b3 100644 --- a/homeassistant/components/tplink/__init__.py +++ b/homeassistant/components/tplink/__init__.py @@ -10,7 +10,7 @@ from kasa.discover import Discover from homeassistant import config_entries from homeassistant.components import network -from homeassistant.config_entries import ConfigEntry, ConfigEntryNotReady +from homeassistant.config_entries import ConfigEntry from homeassistant.const import ( CONF_HOST, CONF_MAC, @@ -18,6 +18,7 @@ from homeassistant.const import ( EVENT_HOMEASSISTANT_STARTED, ) from homeassistant.core import HomeAssistant, callback +from homeassistant.exceptions import ConfigEntryNotReady from homeassistant.helpers import device_registry as dr from homeassistant.helpers.event import async_track_time_interval from homeassistant.helpers.typing import ConfigType diff --git a/homeassistant/components/yale_smart_alarm/coordinator.py b/homeassistant/components/yale_smart_alarm/coordinator.py index 3cef1876e3a..bfc43d9714d 100644 --- a/homeassistant/components/yale_smart_alarm/coordinator.py +++ b/homeassistant/components/yale_smart_alarm/coordinator.py @@ -9,11 +9,8 @@ from yalesmartalarmclient.client import AuthenticationError, YaleSmartAlarmClien from homeassistant.config_entries import ConfigEntry from homeassistant.const import CONF_PASSWORD, CONF_USERNAME from homeassistant.core import HomeAssistant -from homeassistant.helpers.update_coordinator import ( - ConfigEntryAuthFailed, - DataUpdateCoordinator, - UpdateFailed, -) +from homeassistant.exceptions import ConfigEntryAuthFailed +from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed from .const import DEFAULT_SCAN_INTERVAL, DOMAIN, LOGGER diff --git a/homeassistant/helpers/script.py b/homeassistant/helpers/script.py index 925a5b9746f..1a846ab2c8e 100644 --- a/homeassistant/helpers/script.py +++ b/homeassistant/helpers/script.py @@ -1216,7 +1216,7 @@ class Script: self._hass, run_variables, ) - except template.TemplateError as err: + except exceptions.TemplateError as err: self._log("Error rendering variables: %s", err, level=logging.ERROR) raise elif run_variables: