Skip to content

Commit 8c88d62

Browse files
alexrudd2garvan2021
authored andcommitted
Remove unnecessary abort() call
Co-authored-by: kelvin <[email protected]>
1 parent 675f28c commit 8c88d62

File tree

3 files changed

+2
-6
lines changed

3 files changed

+2
-6
lines changed

pymodbus/transport/transport.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -412,8 +412,6 @@ def transport_close(self, intern: bool = False, reconnect: bool = False) -> None
412412
if not intern:
413413
self.is_closing = True
414414
if self.transport:
415-
if hasattr(self.transport, "abort"):
416-
self.transport.abort()
417415
self.transport.close()
418416
self.transport = None
419417
self.recv_buffer = b""
@@ -614,7 +612,7 @@ def write(self, data: bytes) -> None:
614612
# Dummy methods #
615613
# ------------- #
616614
def abort(self) -> None:
617-
"""Abort connection."""
615+
"""Old alias for closing the connection."""
618616
self.close()
619617

620618
def can_write_eof(self) -> bool:

pymodbus/transport/transport_serial.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ def is_closing(self):
117117
return False
118118

119119
def abort(self) -> None:
120-
"""Close the transport immediately."""
120+
"""Old alias for closing the connection."""
121121
self.close()
122122

123123
# ------------------------------------------------

test/sub_transport/test_basic.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,13 +188,11 @@ async def test_broadcast_local_echo(self, client):
188188

189189
async def test_transport_close(self, server, dummy_protocol):
190190
"""Test transport_close()."""
191-
dummy_protocol.abort = mock.MagicMock()
192191
dummy_protocol.close = mock.MagicMock()
193192
server.connection_made(dummy_protocol())
194193
server.recv_buffer = b"abc"
195194
server.reconnect_task = mock.MagicMock()
196195
server.transport_close()
197-
dummy_protocol.abort.assert_called_once()
198196
dummy_protocol.close.assert_called_once()
199197
assert not server.recv_buffer
200198
await server.transport_listen()

0 commit comments

Comments
 (0)