diff --git a/homeassistant/components/modbus/__init__.py b/homeassistant/components/modbus/__init__.py index a6e901af749..823703ac4c9 100644 --- a/homeassistant/components/modbus/__init__.py +++ b/homeassistant/components/modbus/__init__.py @@ -2,6 +2,8 @@ import logging import threading +from pymodbus.client.sync import ModbusSerialClient, ModbusTcpClient, ModbusUdpClient +from pymodbus.transaction import ModbusRtuFramer import voluptuous as vol from homeassistant.const import ( @@ -91,9 +93,7 @@ def setup_client(client_config): client_type = client_config[CONF_TYPE] if client_type == "serial": - from pymodbus.client.sync import ModbusSerialClient as ModbusClient - - return ModbusClient( + return ModbusSerialClient( method=client_config[CONF_METHOD], port=client_config[CONF_PORT], baudrate=client_config[CONF_BAUDRATE], @@ -103,27 +103,20 @@ def setup_client(client_config): timeout=client_config[CONF_TIMEOUT], ) if client_type == "rtuovertcp": - from pymodbus.client.sync import ModbusTcpClient as ModbusClient - from pymodbus.transaction import ModbusRtuFramer - - return ModbusClient( + return ModbusTcpClient( host=client_config[CONF_HOST], port=client_config[CONF_PORT], framer=ModbusRtuFramer, timeout=client_config[CONF_TIMEOUT], ) if client_type == "tcp": - from pymodbus.client.sync import ModbusTcpClient as ModbusClient - - return ModbusClient( + return ModbusTcpClient( host=client_config[CONF_HOST], port=client_config[CONF_PORT], timeout=client_config[CONF_TIMEOUT], ) if client_type == "udp": - from pymodbus.client.sync import ModbusUdpClient as ModbusClient - - return ModbusClient( + return ModbusUdpClient( host=client_config[CONF_HOST], port=client_config[CONF_PORT], timeout=client_config[CONF_TIMEOUT], diff --git a/homeassistant/components/modbus/climate.py b/homeassistant/components/modbus/climate.py index c6764482d96..99ea686543d 100644 --- a/homeassistant/components/modbus/climate.py +++ b/homeassistant/components/modbus/climate.py @@ -6,8 +6,8 @@ import voluptuous as vol from homeassistant.components.climate import PLATFORM_SCHEMA, ClimateDevice from homeassistant.components.climate.const import ( - SUPPORT_TARGET_TEMPERATURE, HVAC_MODE_AUTO, + SUPPORT_TARGET_TEMPERATURE, ) from homeassistant.const import ( ATTR_TEMPERATURE, diff --git a/homeassistant/components/modbus/sensor.py b/homeassistant/components/modbus/sensor.py index 1a5c71812d6..86f6445b8d6 100644 --- a/homeassistant/components/modbus/sensor.py +++ b/homeassistant/components/modbus/sensor.py @@ -1,8 +1,8 @@ """Support for Modbus Register sensors.""" import logging import struct - from typing import Any, Union + import voluptuous as vol from homeassistant.components.sensor import PLATFORM_SCHEMA