Skip to content

Commit 4381f0e

Browse files
committed
ModbusException.
1 parent 2403abb commit 4381f0e

File tree

3 files changed

+14
-9
lines changed

3 files changed

+14
-9
lines changed

examples/client_async.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
AsyncModbusTcpClient,
4040
AsyncModbusTlsClient,
4141
AsyncModbusUdpClient,
42+
ModbusException,
4243
)
43-
from pymodbus.exceptions import ModbusIOException
4444

4545

4646
logging.basicConfig()
@@ -135,7 +135,7 @@ async def run_a_few_calls(client):
135135
rr = await client.read_holding_registers(4, 2, slave=1)
136136
assert rr.registers[0] == 17
137137
assert rr.registers[1] == 17
138-
except ModbusIOException:
138+
except ModbusException:
139139
pass
140140

141141

examples/client_sync.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
# import the various client implementations
3939
# --------------------------------------------------------------------------- #
4040
from pymodbus.client import (
41+
ModbusException,
4142
ModbusSerialClient,
4243
ModbusTcpClient,
4344
ModbusTlsClient,
@@ -136,12 +137,14 @@ def run_sync_client(client, modbus_calls=None):
136137

137138
def run_a_few_calls(client):
138139
"""Test connection works."""
139-
rr = client.read_coils(32, 1, slave=1)
140-
assert len(rr.bits) == 8
141-
rr = client.read_holding_registers(4, 2, slave=1)
142-
assert rr.registers[0] == 17
143-
assert rr.registers[1] == 17
144-
140+
try:
141+
rr = client.read_coils(32, 1, slave=1)
142+
assert len(rr.bits) == 8
143+
rr = client.read_holding_registers(4, 2, slave=1)
144+
assert rr.registers[0] == 17
145+
assert rr.registers[1] == 17
146+
except ModbusException as exc:
147+
raise exc
145148

146149
def main(cmdline=None):
147150
"""Combine setup and run."""

pymodbus/client/__init__.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,17 @@
55
"AsyncModbusTcpClient",
66
"AsyncModbusTlsClient",
77
"AsyncModbusUdpClient",
8+
"Framer",
9+
"ModbusException",
810
"ModbusSerialClient",
911
"ModbusTcpClient",
1012
"ModbusTlsClient",
1113
"ModbusUdpClient",
12-
"Framer"
1314
]
1415

1516
from pymodbus.client.serial import AsyncModbusSerialClient, ModbusSerialClient
1617
from pymodbus.client.tcp import AsyncModbusTcpClient, ModbusTcpClient
1718
from pymodbus.client.tls import AsyncModbusTlsClient, ModbusTlsClient
1819
from pymodbus.client.udp import AsyncModbusUdpClient, ModbusUdpClient
20+
from pymodbus.exceptions import ModbusException
1921
from pymodbus.framer import Framer

0 commit comments

Comments
 (0)