Skip to content

Commit 656857b

Browse files
committed
Merge master
2 parents 88e1727 + 615289d commit 656857b

File tree

4 files changed

+5
-0
lines changed

4 files changed

+5
-0
lines changed

pymodbus/exceptions.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ def __init__(self, string=""):
9191
message = "[Invalid Message] %s" % string
9292
ModbusException.__init__(self, message)
9393

94+
9495
#---------------------------------------------------------------------------#
9596
# Exported symbols
9697
#---------------------------------------------------------------------------#

pymodbus/transaction.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ def execute(self, request):
128128
self._send(packet)
129129
# exception = False
130130
result = self._recv(expected_response_length or 1024)
131+
131132
if not result and self.retry_on_empty:
132133
retries -= 1
133134
continue
@@ -178,6 +179,7 @@ def _recv(self, expected_response_length):
178179
retries -= 1
179180
return result
180181

182+
181183
def addTransaction(self, request, tid=None):
182184
''' Adds a transaction to the handler
183185

pymodbus/version.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ def __str__(self):
4444
version = Version('pymodbus', 1, 3, 2)
4545

4646

47+
4748
version.__name__ = 'pymodbus' # fix epydoc error
4849

4950
#---------------------------------------------------------------------------#

test/test_other_messages.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ def testReportSlaveId(self):
9292
self.assertEqual(request.execute().function_code, 0x11)
9393

9494
response = ReportSlaveIdResponse(request.execute().identifier, True)
95+
9596
self.assertEqual(response.encode(), b'\tPymodbus\xff')
9697
response.decode(b'\x03\x12\x00')
9798
self.assertEqual(response.status, False)

0 commit comments

Comments
 (0)