From 0f90678e0ed79aef806504e7602b236f93a2f5f6 Mon Sep 17 00:00:00 2001 From: jan iversen Date: Mon, 19 Apr 2021 10:13:32 +0200 Subject: [PATCH] Change HomeAssistantType -> HomeAssistant in modbus (#49400) --- homeassistant/components/modbus/binary_sensor.py | 9 +++------ homeassistant/components/modbus/climate.py | 9 +++------ homeassistant/components/modbus/cover.py | 9 +++------ homeassistant/components/modbus/sensor.py | 9 +++------ homeassistant/components/modbus/switch.py | 5 +++-- 5 files changed, 15 insertions(+), 26 deletions(-) diff --git a/homeassistant/components/modbus/binary_sensor.py b/homeassistant/components/modbus/binary_sensor.py index e422eb7528e..32f3527f801 100644 --- a/homeassistant/components/modbus/binary_sensor.py +++ b/homeassistant/components/modbus/binary_sensor.py @@ -21,13 +21,10 @@ from homeassistant.const import ( CONF_SCAN_INTERVAL, CONF_SLAVE, ) +from homeassistant.core import HomeAssistant from homeassistant.helpers import config_validation as cv from homeassistant.helpers.event import async_track_time_interval -from homeassistant.helpers.typing import ( - ConfigType, - DiscoveryInfoType, - HomeAssistantType, -) +from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType from .const import ( CALL_TYPE_COIL, @@ -72,7 +69,7 @@ PLATFORM_SCHEMA = vol.All( async def async_setup_platform( - hass: HomeAssistantType, + hass: HomeAssistant, config: ConfigType, async_add_entities, discovery_info: DiscoveryInfoType | None = None, diff --git a/homeassistant/components/modbus/climate.py b/homeassistant/components/modbus/climate.py index 6140ac038f7..25893ce0080 100644 --- a/homeassistant/components/modbus/climate.py +++ b/homeassistant/components/modbus/climate.py @@ -24,12 +24,9 @@ from homeassistant.const import ( TEMP_CELSIUS, TEMP_FAHRENHEIT, ) +from homeassistant.core import HomeAssistant from homeassistant.helpers.event import async_track_time_interval -from homeassistant.helpers.typing import ( - ConfigType, - DiscoveryInfoType, - HomeAssistantType, -) +from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType from .const import ( ATTR_TEMPERATURE, @@ -56,7 +53,7 @@ _LOGGER = logging.getLogger(__name__) async def async_setup_platform( - hass: HomeAssistantType, + hass: HomeAssistant, config: ConfigType, async_add_entities, discovery_info: DiscoveryInfoType | None = None, diff --git a/homeassistant/components/modbus/cover.py b/homeassistant/components/modbus/cover.py index bc7c946402b..3a1c1c56536 100644 --- a/homeassistant/components/modbus/cover.py +++ b/homeassistant/components/modbus/cover.py @@ -15,13 +15,10 @@ from homeassistant.const import ( CONF_SCAN_INTERVAL, CONF_SLAVE, ) +from homeassistant.core import HomeAssistant from homeassistant.helpers.event import async_track_time_interval from homeassistant.helpers.restore_state import RestoreEntity -from homeassistant.helpers.typing import ( - ConfigType, - DiscoveryInfoType, - HomeAssistantType, -) +from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType from .const import ( CALL_TYPE_COIL, @@ -40,7 +37,7 @@ from .modbus import ModbusHub async def async_setup_platform( - hass: HomeAssistantType, + hass: HomeAssistant, config: ConfigType, async_add_entities, discovery_info: DiscoveryInfoType | None = None, diff --git a/homeassistant/components/modbus/sensor.py b/homeassistant/components/modbus/sensor.py index dcc68b52db8..b926ef6c5bd 100644 --- a/homeassistant/components/modbus/sensor.py +++ b/homeassistant/components/modbus/sensor.py @@ -27,14 +27,11 @@ from homeassistant.const import ( CONF_STRUCTURE, CONF_UNIT_OF_MEASUREMENT, ) +from homeassistant.core import HomeAssistant from homeassistant.helpers import config_validation as cv from homeassistant.helpers.event import async_track_time_interval from homeassistant.helpers.restore_state import RestoreEntity -from homeassistant.helpers.typing import ( - ConfigType, - DiscoveryInfoType, - HomeAssistantType, -) +from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType from .const import ( CALL_TYPE_REGISTER_HOLDING, @@ -117,7 +114,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend( async def async_setup_platform( - hass: HomeAssistantType, + hass: HomeAssistant, config: ConfigType, async_add_entities, discovery_info: DiscoveryInfoType | None = None, diff --git a/homeassistant/components/modbus/switch.py b/homeassistant/components/modbus/switch.py index 2985d8b2c05..b5aef6d42c0 100644 --- a/homeassistant/components/modbus/switch.py +++ b/homeassistant/components/modbus/switch.py @@ -21,10 +21,11 @@ from homeassistant.const import ( CONF_SWITCHES, STATE_ON, ) +from homeassistant.core import HomeAssistant from homeassistant.helpers import config_validation as cv from homeassistant.helpers.event import async_track_time_interval from homeassistant.helpers.restore_state import RestoreEntity -from homeassistant.helpers.typing import ConfigType, HomeAssistantType +from homeassistant.helpers.typing import ConfigType from .const import ( CALL_TYPE_COIL, @@ -88,7 +89,7 @@ PLATFORM_SCHEMA = vol.All( async def async_setup_platform( - hass: HomeAssistantType, config: ConfigType, async_add_entities, discovery_info=None + hass: HomeAssistant, config: ConfigType, async_add_entities, discovery_info=None ): """Read configuration and create Modbus switches.""" switches = []