diff --git a/homeassistant/components/group/__init__.py b/homeassistant/components/group/__init__.py index 604f973142b4..3b8354cbcc4f 100644 --- a/homeassistant/components/group/__init__.py +++ b/homeassistant/components/group/__init__.py @@ -15,15 +15,10 @@ from homeassistant.const import ( ) from homeassistant.core import HomeAssistant from homeassistant.exceptions import ConfigEntryError -from homeassistant.helpers import config_validation as cv -from homeassistant.helpers import entity_registry as er +from homeassistant.helpers import config_validation as cv, entity_registry as er from homeassistant.helpers.group import ( expand_entity_ids as _expand_entity_ids, -) -from homeassistant.helpers.group import ( get_entity_ids as _get_entity_ids, -) -from homeassistant.helpers.group import ( get_group_entities, ) from homeassistant.helpers.typing import ConfigType diff --git a/homeassistant/components/group/config_flow.py b/homeassistant/components/group/config_flow.py index c1a75e5871a5..d3619c2f96db 100644 --- a/homeassistant/components/group/config_flow.py +++ b/homeassistant/components/group/config_flow.py @@ -141,9 +141,9 @@ SENSOR_CONFIG_SCHEMA = basic_group_config_schema( ["sensor", "number", "input_number"] ).extend(SENSOR_CONFIG_EXTENDS) -SENSOR_IMPORT_SCHEMA = vol.Schema( +SENSOR_IMPORT_SCHEMA = probatio.Schema( { - vol.Required("old_config_entry_id"): selector.TextSelector(), + probatio.Required("old_config_entry_id"): selector.TextSelector(), } ).extend(SENSOR_CONFIG_SCHEMA.schema) @@ -220,7 +220,7 @@ async def validate_import( try: validated_input = SENSOR_IMPORT_SCHEMA(user_input) - except vol.Invalid as err: + except probatio.Invalid as err: raise AbortFlow( reason="invalid_import", description_placeholders={"error": str(err)} ) from err diff --git a/homeassistant/components/min_max/repairs.py b/homeassistant/components/min_max/repairs.py index ef11624a6bf7..59b2f8457eb6 100644 --- a/homeassistant/components/min_max/repairs.py +++ b/homeassistant/components/min_max/repairs.py @@ -2,7 +2,7 @@ from typing import TYPE_CHECKING, Any -import voluptuous as vol +import probatio from homeassistant.components.group import CONF_HIDE_MEMBERS, DOMAIN as GROUP_DOMAIN from homeassistant.components.repairs import ( @@ -79,7 +79,7 @@ class MigrateToGroupSensorFlow(RepairsFlow): return self.async_show_form( step_id="migrate", - data_schema=vol.Schema({}), + data_schema=probatio.Schema({}), description_placeholders={"title": title}, ) diff --git a/homeassistant/components/min_max/sensor.py b/homeassistant/components/min_max/sensor.py index 1bfa8ca1a247..ad57944cad0a 100644 --- a/homeassistant/components/min_max/sensor.py +++ b/homeassistant/components/min_max/sensor.py @@ -1,10 +1,10 @@ """Support for displaying minimal, maximal, mean or median values.""" +from datetime import datetime import hashlib import json import logging import statistics -from datetime import datetime from typing import Any, override import probatio @@ -12,8 +12,6 @@ import probatio from homeassistant.components.group import CONF_ENTITIES from homeassistant.components.sensor import ( PLATFORM_SCHEMA as SENSOR_PLATFORM_SCHEMA, -) -from homeassistant.components.sensor import ( SensorDeviceClass, SensorEntity, SensorStateClass, @@ -31,8 +29,7 @@ from homeassistant.const import ( ) from homeassistant.core import Event, EventStateChangedData, HomeAssistant, callback from homeassistant.exceptions import HomeAssistantError -from homeassistant.helpers import config_validation as cv -from homeassistant.helpers import entity_registry as er +from homeassistant.helpers import config_validation as cv, entity_registry as er from homeassistant.helpers.entity import get_device_class from homeassistant.helpers.entity_platform import ( AddConfigEntryEntitiesCallback,