feedc0de/homeassistant-core
1
0
Fork 0
forked from home-assistant/core
Code Pull Requests Activity

Fix incorrect attribute checks in Modbus hub (#50241)

Browse Source
This commit is contained in:
Vladimír Záhradník
2021-05-08 13:26:31 +02:00
committed by Paulus Schoutsen
parent 22e62fa61a
commit e482827975
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
homeassistant/components/modbus/modbus.py
View File

@@ -237,7 +237,7 @@ class ModbusHub:
except ModbusException as exception_error: except ModbusException as exception_error:
self._log_error(exception_error) self._log_error(exception_error)
result = exception_error result = exception_error
if not hasattr(result, "registers"): if not hasattr(result, "bits"):
self._log_error(result) self._log_error(result)
return None return None
self._in_error = False self._in_error = False
@@ -251,7 +251,7 @@ class ModbusHub:
result = self._client.read_discrete_inputs(address, count, **kwargs) result = self._client.read_discrete_inputs(address, count, **kwargs)
except ModbusException as exception_error: except ModbusException as exception_error:
result = exception_error result = exception_error
if not hasattr(result, "registers"): if not hasattr(result, "bits"):
self._log_error(result) self._log_error(result)
return None return None
self._in_error = False self._in_error = False
@@ -293,7 +293,7 @@ class ModbusHub:
result = self._client.write_coil(address, value, **kwargs) result = self._client.write_coil(address, value, **kwargs)
except ModbusException as exception_error: except ModbusException as exception_error:
result = exception_error result = exception_error
if not hasattr(result, "registers"): if not hasattr(result, "value"):
self._log_error(result) self._log_error(result)
return False return False
self._in_error = False self._in_error = False
@@ -307,7 +307,7 @@ class ModbusHub:
result = self._client.write_coils(address, values, **kwargs) result = self._client.write_coils(address, values, **kwargs)
except ModbusException as exception_error: except ModbusException as exception_error:
result = exception_error result = exception_error
if not hasattr(result, "registers"): if not hasattr(result, "count"):
self._log_error(result) self._log_error(result)
return False return False
self._in_error = False self._in_error = False
@@ -321,7 +321,7 @@ class ModbusHub:
result = self._client.write_register(address, value, **kwargs) result = self._client.write_register(address, value, **kwargs)
except ModbusException as exception_error: except ModbusException as exception_error:
result = exception_error result = exception_error
if not hasattr(result, "registers"): if not hasattr(result, "value"):
self._log_error(result) self._log_error(result)
return False return False
self._in_error = False self._in_error = False
@@ -335,7 +335,7 @@ class ModbusHub:
result = self._client.write_registers(address, values, **kwargs) result = self._client.write_registers(address, values, **kwargs)
except ModbusException as exception_error: except ModbusException as exception_error:
result = exception_error result = exception_error
if not hasattr(result, "registers"): if not hasattr(result, "count"):
self._log_error(result) self._log_error(result)
return False return False
self._in_error = False self._in_error = False