Skip to content

Commit 05700b8

Browse files
committed
Merge branch 'dev'
2 parents a38e0d2 + ad6cf6b commit 05700b8

File tree

7 files changed

+9
-5
lines changed

7 files changed

+9
-5
lines changed

CHANGELOG.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ helps make pymodbus a better product.
77

88
:ref:`Authors`: contains a complete list of volunteers have contributed to each major version.
99

10+
Version 3.8.2
11+
-------------
12+
13+
1014
Version 3.8.1
1115
-------------
1216
* Convert endianness (#2506)

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Upgrade examples:
2626
- 3.6.1 -> 3.7.0: Smaller changes to the pymodbus calls might be needed
2727
- 2.5.4 -> 3.0.0: Major changes in the application might be needed
2828

29-
Current release is `3.8.1 <https://github.com/pymodbus-dev/pymodbus/releases/tag/v3.8.1>`_.
29+
Current release is `3.8.2 <https://github.com/pymodbus-dev/pymodbus/releases/tag/v3.8.2>`_.
3030

3131
Bleeding edge (not released) is `dev <https://github.com/pymodbus-dev/pymodbus/tree/dev>`_.
3232

doc/source/_static/examples.tgz

33 Bytes
Binary file not shown.

doc/source/_static/examples.zip

0 Bytes
Binary file not shown.

doc/source/roadmap.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ It is the community that decides how pymodbus evolves NOT the maintainers !
1515

1616
The following bullet points are what the maintainers focus on:
1717

18-
- 3.8.2, bug fix release, with:
18+
- 3.8.3 bug fix release, with:
1919
- Currently not planned
2020
- 3.9.0, with:
2121
- All of branch wait_next_api

pymodbus/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@
1818
from pymodbus.pdu import ExceptionResponse
1919

2020

21-
__version__ = "3.8.1"
21+
__version__ = "3.8.2"
2222
__version_full__ = f"[pymodbus, version {__version__}]"

pymodbus/transaction/transaction.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def __init__(
6262
else:
6363
self._lock = asyncio.Lock()
6464
self.low_level_send = self.send
65-
self.response_future: asyncio.Future = asyncio.Future()
65+
self.response_future: asyncio.Future = asyncio.Future()
6666

6767
def dummy_trace_packet(self, sending: bool, data: bytes) -> bytes:
6868
"""Do dummy trace."""
@@ -161,8 +161,8 @@ async def server_execute(self) -> tuple[ModbusPDU, int, Exception]:
161161
Used in server, with an instance for each connection, therefore
162162
there are NO concurrency.
163163
"""
164-
pdu, addr, exc = await asyncio.wait_for(self.response_future, None)
165164
self.response_future = asyncio.Future()
165+
pdu, addr, exc = await asyncio.wait_for(self.response_future, None)
166166
return pdu, addr, exc
167167

168168
def pdu_send(self, pdu: ModbusPDU, addr: tuple | None = None) -> None:

0 commit comments

Comments
 (0)