Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixes access to asyncio loop via loop property of SerialTransport #1804

Merged
merged 8 commits into from
Oct 8, 2023
Merged

fixes access to asyncio loop via loop property of SerialTransport #1804

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e4a3388
adds test to verify access to event loop of the protocol of SerialTra…
MAKOMO Oct 8, 2023
a461a2c
fixes access to asyncio loop via loop property of SerialTransport
MAKOMO Oct 8, 2023
576e56d
Not sure self.async_loop is the same loop as the one of the protocol,…
MAKOMO Oct 8, 2023
b0e8fdd
removes the invalid access to protocol._loop
MAKOMO Oct 8, 2023
fcda325
typo
MAKOMO Oct 8, 2023
2dd0adb
make black happy
MAKOMO Oct 8, 2023
f7c6c08
replace specific EventLoop type with generic asyncio.AbstracEventLoop
MAKOMO Oct 8, 2023
b0a79f7
removes test_loop
MAKOMO Oct 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions pymodbus/transport/transport_serial.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def __init__(self, loop, protocol, *args, **kwargs):
"""Initialize."""
super().__init__()
self.async_loop = loop
self._protocol = protocol
self._protocol: asyncio.BaseProtocol = protocol
self.sync_serial = serial.serial_for_url(*args, **kwargs)
self._closing = False
self._write_buffer = []
Expand All @@ -37,7 +37,7 @@ def __init__(self, loop, protocol, *args, **kwargs):
@property
def loop(self):
"""Return asyncio event loop."""
return self._protocol.loop
return self.async_loop

def get_protocol(self) -> asyncio.BaseProtocol:
"""Return protocol"""
Expand Down Expand Up @@ -95,7 +95,7 @@ def _read_ready(self):
try:
data = self.sync_serial.read(1024)
except serial.SerialException as exc:
self._protocol.loop.call_soon(self._call_connection_lost, exc)
self.async_loop.call_soon(self._call_connection_lost, exc)
self.close()
else:
if data:
Expand Down Expand Up @@ -130,7 +130,7 @@ def _write_ready(self):
except (BlockingIOError, InterruptedError):
self._write_buffer.append(data)
except serial.SerialException as exc:
self._protocol.loop.call_soon(self._call_connection_lost, exc)
self.async_loop.call_soon(self._call_connection_lost, exc)
self.abort()
else:
if nlen == len(data):
Expand Down