From b0f72f59dab553defddb2ba5e5508a93e4adf52d Mon Sep 17 00:00:00 2001 From: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Date: Wed, 5 Jan 2022 14:55:38 +0100 Subject: [PATCH] Use imports from `core` (#63458) --- homeassistant/components/aftership/sensor.py | 3 +-- .../components/homeassistant/triggers/state.py | 10 ++++++++-- homeassistant/components/modbus/modbus.py | 4 ++-- homeassistant/components/surepetcare/__init__.py | 3 +-- homeassistant/components/tradfri/__init__.py | 4 ++-- homeassistant/config_entries.py | 3 +-- homeassistant/helpers/entity.py | 4 ++-- 7 files changed, 17 insertions(+), 14 deletions(-) diff --git a/homeassistant/components/aftership/sensor.py b/homeassistant/components/aftership/sensor.py index be3fd74d6bd..5d6c2cc74b9 100644 --- a/homeassistant/components/aftership/sensor.py +++ b/homeassistant/components/aftership/sensor.py @@ -13,12 +13,11 @@ from homeassistant.components.sensor import ( SensorEntity, ) from homeassistant.const import CONF_API_KEY, CONF_NAME -from homeassistant.core import HomeAssistant +from homeassistant.core import HomeAssistant, ServiceCall from homeassistant.helpers.aiohttp_client import async_get_clientsession import homeassistant.helpers.config_validation as cv from homeassistant.helpers.dispatcher import async_dispatcher_send from homeassistant.helpers.entity_platform import AddEntitiesCallback -from homeassistant.helpers.service import ServiceCall from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType from homeassistant.util import Throttle diff --git a/homeassistant/components/homeassistant/triggers/state.py b/homeassistant/components/homeassistant/triggers/state.py index e16416c2f13..cafaea40c31 100644 --- a/homeassistant/components/homeassistant/triggers/state.py +++ b/homeassistant/components/homeassistant/triggers/state.py @@ -8,14 +8,20 @@ import voluptuous as vol from homeassistant import exceptions from homeassistant.const import CONF_ATTRIBUTE, CONF_FOR, CONF_PLATFORM, MATCH_ALL -from homeassistant.core import CALLBACK_TYPE, HassJob, HomeAssistant, State, callback +from homeassistant.core import ( + CALLBACK_TYPE, + Event, + HassJob, + HomeAssistant, + State, + callback, +) from homeassistant.helpers import ( config_validation as cv, entity_registry as er, template, ) from homeassistant.helpers.event import ( - Event, async_track_same_state, async_track_state_change_event, process_state_match, diff --git a/homeassistant/components/modbus/modbus.py b/homeassistant/components/modbus/modbus.py index 9d1c13ffd9b..0ea4c57d4d9 100644 --- a/homeassistant/components/modbus/modbus.py +++ b/homeassistant/components/modbus/modbus.py @@ -29,11 +29,11 @@ from homeassistant.const import ( CONF_TYPE, EVENT_HOMEASSISTANT_STOP, ) -from homeassistant.core import HomeAssistant, ServiceCall, callback +from homeassistant.core import Event, HomeAssistant, ServiceCall, callback import homeassistant.helpers.config_validation as cv from homeassistant.helpers.discovery import async_load_platform from homeassistant.helpers.dispatcher import async_dispatcher_send -from homeassistant.helpers.event import Event, async_call_later +from homeassistant.helpers.event import async_call_later from homeassistant.helpers.typing import ConfigType from .const import ( diff --git a/homeassistant/components/surepetcare/__init__.py b/homeassistant/components/surepetcare/__init__.py index 78988afa1cf..75ea1306ccf 100644 --- a/homeassistant/components/surepetcare/__init__.py +++ b/homeassistant/components/surepetcare/__init__.py @@ -18,11 +18,10 @@ from homeassistant.const import ( CONF_USERNAME, Platform, ) -from homeassistant.core import HomeAssistant +from homeassistant.core import HomeAssistant, ServiceCall from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady from homeassistant.helpers import config_validation as cv from homeassistant.helpers.aiohttp_client import async_get_clientsession -from homeassistant.helpers.service import ServiceCall from homeassistant.helpers.typing import ConfigType from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed diff --git a/homeassistant/components/tradfri/__init__.py b/homeassistant/components/tradfri/__init__.py index 2acd79a3e49..f207bb25be6 100644 --- a/homeassistant/components/tradfri/__init__.py +++ b/homeassistant/components/tradfri/__init__.py @@ -12,11 +12,11 @@ import voluptuous as vol from homeassistant import config_entries from homeassistant.config_entries import ConfigEntry from homeassistant.const import EVENT_HOMEASSISTANT_STOP -from homeassistant.core import HomeAssistant +from homeassistant.core import Event, HomeAssistant from homeassistant.exceptions import ConfigEntryNotReady import homeassistant.helpers.config_validation as cv from homeassistant.helpers.dispatcher import async_dispatcher_send -from homeassistant.helpers.event import Event, async_track_time_interval +from homeassistant.helpers.event import async_track_time_interval from homeassistant.helpers.typing import ConfigType from .const import ( diff --git a/homeassistant/config_entries.py b/homeassistant/config_entries.py index da524bf068d..7d9e3ff94c3 100644 --- a/homeassistant/config_entries.py +++ b/homeassistant/config_entries.py @@ -15,10 +15,9 @@ import weakref from . import data_entry_flow, loader from .backports.enum import StrEnum from .const import EVENT_HOMEASSISTANT_STARTED, EVENT_HOMEASSISTANT_STOP -from .core import CALLBACK_TYPE, CoreState, HomeAssistant, callback +from .core import CALLBACK_TYPE, CoreState, Event, HomeAssistant, callback from .exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady, HomeAssistantError from .helpers import device_registry, entity_registry -from .helpers.event import Event from .helpers.frame import report from .helpers.typing import UNDEFINED, ConfigType, DiscoveryInfoType, UndefinedType from .setup import async_process_deps_reqs, async_setup_component diff --git a/homeassistant/helpers/entity.py b/homeassistant/helpers/entity.py index 474d079edbc..db9484233bc 100644 --- a/homeassistant/helpers/entity.py +++ b/homeassistant/helpers/entity.py @@ -35,7 +35,7 @@ from homeassistant.const import ( TEMP_CELSIUS, TEMP_FAHRENHEIT, ) -from homeassistant.core import CALLBACK_TYPE, Context, HomeAssistant, callback +from homeassistant.core import CALLBACK_TYPE, Context, Event, HomeAssistant, callback from homeassistant.exceptions import HomeAssistantError, NoEntitySpecifiedError from homeassistant.loader import bind_hass from homeassistant.util import dt as dt_util, ensure_unique_string, slugify @@ -43,7 +43,7 @@ from homeassistant.util import dt as dt_util, ensure_unique_string, slugify from . import entity_registry as er from .device_registry import DeviceEntryType from .entity_platform import EntityPlatform -from .event import Event, async_track_entity_registry_updated_event +from .event import async_track_entity_registry_updated_event from .typing import StateType _LOGGER = logging.getLogger(__name__)