From 05c1aff0f692ae749acdcdf89a907bf727001105 Mon Sep 17 00:00:00 2001
From: jan iversen <jancasacondor@gmail.com>
Date: Sun, 15 Jan 2023 23:30:26 +0100
Subject: [PATCH] Bump pymodbus library to V3.1.0 (#85961)

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

diff --git a/homeassistant/components/modbus/manifest.json b/homeassistant/components/modbus/manifest.json
index 96127f39bbd..a68964b405a 100644
--- a/homeassistant/components/modbus/manifest.json
+++ b/homeassistant/components/modbus/manifest.json
@@ -2,7 +2,7 @@
   "domain": "modbus",
   "name": "Modbus",
   "documentation": "https://www.home-assistant.io/integrations/modbus",
-  "requirements": ["pymodbus==2.5.3"],
+  "requirements": ["pymodbus==3.1.0"],
   "codeowners": ["@adamchengtkc", "@janiversen", "@vzahradnik"],
   "quality_scale": "gold",
   "iot_class": "local_polling",
diff --git a/homeassistant/components/modbus/modbus.py b/homeassistant/components/modbus/modbus.py
index e2240f530c6..0c4215f4dbd 100644
--- a/homeassistant/components/modbus/modbus.py
+++ b/homeassistant/components/modbus/modbus.py
@@ -7,8 +7,8 @@ from collections.abc import Callable
 import logging
 from typing import Any
 
-from pymodbus.client.sync import (
-    BaseModbusClient,
+from pymodbus.client import (
+    ModbusBaseClient,
     ModbusSerialClient,
     ModbusTcpClient,
     ModbusUdpClient,
@@ -255,7 +255,7 @@ class ModbusHub:
         """Initialize the Modbus hub."""
 
         # generic configuration
-        self._client: BaseModbusClient | None = None
+        self._client: ModbusBaseClient | None = None
         self._async_cancel_listener: Callable[[], None] | None = None
         self._in_error = False
         self._lock = asyncio.Lock()
@@ -380,7 +380,7 @@ class ModbusHub:
         self, unit: int | None, address: int, value: int | list[int], use_call: str
     ) -> ModbusResponse:
         """Call sync. pymodbus."""
-        kwargs = {"unit": unit} if unit else {}
+        kwargs = {"slave": unit} if unit else {}
         entry = self._pb_call[use_call]
         try:
             result = entry.func(address, value, **kwargs)
diff --git a/requirements_all.txt b/requirements_all.txt
index a47d89e1823..a28d6c4c663 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1774,7 +1774,7 @@ pymitv==1.4.3
 pymochad==0.2.0
 
 # homeassistant.components.modbus
-pymodbus==2.5.3
+pymodbus==3.1.0
 
 # homeassistant.components.monoprice
 pymonoprice==0.4
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index b0822e2a2f6..e2cd4acb9c1 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -1272,7 +1272,7 @@ pymeteoclimatic==0.0.6
 pymochad==0.2.0
 
 # homeassistant.components.modbus
-pymodbus==2.5.3
+pymodbus==3.1.0
 
 # homeassistant.components.monoprice
 pymonoprice==0.4