From bfd9bd3ff2aebd8221e6219c4f6b2be54b49680a Mon Sep 17 00:00:00 2001
From: jan iversen <jancasacondor@gmail.com>
Date: Tue, 23 Jan 2024 21:12:07 +0100
Subject: [PATCH] Bump pymodbus to v2.6.3 (#108736)

---
 homeassistant/components/modbus/manifest.json | 2 +-
 homeassistant/components/modbus/modbus.py     | 8 ++------
 requirements_all.txt                          | 2 +-
 requirements_test_all.txt                     | 2 +-
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/homeassistant/components/modbus/manifest.json b/homeassistant/components/modbus/manifest.json
index 93a3f22c97d..194eb56757e 100644
--- a/homeassistant/components/modbus/manifest.json
+++ b/homeassistant/components/modbus/manifest.json
@@ -6,5 +6,5 @@
   "iot_class": "local_polling",
   "loggers": ["pymodbus"],
   "quality_scale": "gold",
-  "requirements": ["pymodbus==3.5.4"]
+  "requirements": ["pymodbus==3.6.3"]
 }
diff --git a/homeassistant/components/modbus/modbus.py b/homeassistant/components/modbus/modbus.py
index 95c0cd45332..71631352d52 100644
--- a/homeassistant/components/modbus/modbus.py
+++ b/homeassistant/components/modbus/modbus.py
@@ -7,12 +7,8 @@ from collections.abc import Callable
 import logging
 from typing import Any
 
-from pymodbus.client import (
-    ModbusBaseClient,
-    ModbusSerialClient,
-    ModbusTcpClient,
-    ModbusUdpClient,
-)
+from pymodbus.client import ModbusSerialClient, ModbusTcpClient, ModbusUdpClient
+from pymodbus.client.base import ModbusBaseClient
 from pymodbus.exceptions import ModbusException
 from pymodbus.pdu import ModbusResponse
 from pymodbus.transaction import ModbusAsciiFramer, ModbusRtuFramer, ModbusSocketFramer
diff --git a/requirements_all.txt b/requirements_all.txt
index ce637ba1368..fa636569c70 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1937,7 +1937,7 @@ pymitv==1.4.3
 pymochad==0.2.0
 
 # homeassistant.components.modbus
-pymodbus==3.5.4
+pymodbus==3.6.3
 
 # homeassistant.components.monoprice
 pymonoprice==0.4
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index d91588f330b..76c09f44f76 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -1482,7 +1482,7 @@ pymeteoclimatic==0.1.0
 pymochad==0.2.0
 
 # homeassistant.components.modbus
-pymodbus==3.5.4
+pymodbus==3.6.3
 
 # homeassistant.components.monoprice
 pymonoprice==0.4