Commit b582f6b

authored

ExceptionResponse for no_response_expected. (#2801)

1 parent 5be871e commit b582f6bCopy full SHA for b582f6b

File tree

+10

-8

lines changed

+10

-8

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,10 @@ API changes`
`2`	`2`	`===========`
`3`	`3`	`Versions (X.Y.Z) where Z > 0 e.g. 3.0.1 do NOT have API changes!`
`4`	`4`
	`5`	`+API changes 3.12.0`
	`6`	`+------------------`
	`7`	`+- when using no_response_expected=, the call returns None`
	`8`	`+`
`5`	`9`	`API changes 3.11.0`
`6`	`10`	`------------------`
`7`	`11`	`- Revert wrong byte handling in v3.10.0`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -267,8 +267,7 @@ async def async_execute_diagnostic_requests(client):`
`267`	`267`	`rr = await client.diag_getclear_modbus_response(device_id=DEVICE_ID)`
`268`	`268`	`assert not rr.isError() # test that call was OK`
`269`	`269`	`rr = await client.diag_force_listen_only(device_id=DEVICE_ID, no_response_expected=True)`
`270`		`- assert rr.isError() # test that call was OK, error indicate no response`
`271`		`-`
	`270`	`+ assert not rr`
`272`	`271`
`273`	`272`	`# ------------------------`
`274`	`273`	`# Run the calls in groups.`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`from pymodbus.exceptions import ConnectionException, ModbusIOException`
`9`	`9`	`from pymodbus.framer import FramerAscii, FramerBase, FramerRTU`
`10`	`10`	`from pymodbus.logging import Log`
`11`		`-from pymodbus.pdu import ExceptionResponse, ModbusPDU`
	`11`	`+from pymodbus.pdu import ModbusPDU`
`12`	`12`	`from pymodbus.transport import CommParams, ModbusProtocol`
`13`	`13`
`14`	`14`
`@@ -127,7 +127,7 @@ def sync_execute(self, no_response_expected: bool, request: ModbusPDU) -> Modbus`
`127`	`127`	`while count_retries <= self.retries:`
`128`	`128`	`self.pdu_send(request)`
`129`	`129`	`if no_response_expected:`
`130`		`- return ExceptionResponse(0xff)`
	`130`	`+ return None# type: ignore[return-value]`
`131`	`131`	`try:`
`132`	`132`	`response = self.sync_get_response(request.dev_id, request.transaction_id)`
`133`	`133`	`if response.dev_id != request.dev_id:`
`@@ -170,7 +170,7 @@ async def execute(self, no_response_expected: bool, request: ModbusPDU) -> Modbu`
`170`	`170`	`self.response_future = asyncio.Future()`
`171`	`171`	`self.pdu_send(request)`
`172`	`172`	`if no_response_expected:`
`173`		`- return ExceptionResponse(0xff)`
	`173`	`+ return None# type: ignore[return-value]`
`174`	`174`	`try:`
`175`	`175`	`response = await asyncio.wait_for(`
`176`	`176`	`self.response_future, timeout=self.comm_params.timeout_connect`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -314,8 +314,7 @@ async def test_client_protocol_execute_outside(self, use_clc, no_resp):`
`314`	`314`	`transact.data_received(data)`
`315`	`315`	`if no_resp:`
`316`	`316`	`result = await resp`
`317`		`- assert result.isError()`
`318`		`- assert isinstance(result, ExceptionResponse)`
	`317`	`+ assert not result`
`319`	`318`	`else:`
`320`	`319`	`with pytest.raises(ModbusIOException):`
`321`	`320`	`await resp`
`@@ -599,7 +598,7 @@ def test_sync_client_protocol_execute_outside(self, use_clc, no_resp):`
`599`	`598`	`transact.sync_client.send = mock.Mock()`
`600`	`599`	`result = transact.sync_execute(no_resp, request)`
`601`	`600`	`if no_resp:`
`602`		`- assert result.isError()`
	`601`	`+ assert notresult`
`603`	`602`	`else:`
`604`	`603`	`assert not result.isError()`
`605`	`604`	`assert isinstance(response, ReadCoilsResponse)`

Comments

(0)