Skip to content

Commit 9c8a14c

Browse files
authored
Remove deprecate from payload. (#2532)
1 parent f3762bb commit 9c8a14c

File tree

1 file changed

+35
-35
lines changed

1 file changed

+35
-35
lines changed

pymodbus/payload.py

+35-35
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def __init__(
5757
:param wordorder: The endianness of the word (when wordcount is >= 2)
5858
:param repack: Repack the provided payload based on BO
5959
"""
60-
self.deprecate()
60+
# self.deprecate()
6161
self._payload = payload or []
6262
self._byteorder = byteorder
6363
self._wordorder = wordorder
@@ -89,7 +89,7 @@ def _pack_words(self, fstring: str, value) -> bytes:
8989

9090
def encode(self) -> bytes:
9191
"""Get the payload buffer encoded in bytes."""
92-
self.deprecate()
92+
# self.deprecate()
9393
return b"".join(self._payload)
9494

9595
def __str__(self) -> str:
@@ -101,15 +101,15 @@ def __str__(self) -> str:
101101

102102
def reset(self) -> None:
103103
"""Reset the payload buffer."""
104-
self.deprecate()
104+
# self.deprecate()
105105
self._payload = []
106106

107107
def to_registers(self):
108108
"""Convert the payload buffer to register layout that can be used as a context block.
109109
110110
:returns: The register layout to use as a block
111111
"""
112-
self.deprecate()
112+
# self.deprecate()
113113
# fstring = self._byteorder+"H"
114114
fstring = "!H"
115115
payload = self.build()
@@ -125,7 +125,7 @@ def to_coils(self) -> list[bool]:
125125
126126
:returns: The coil layout to use as a block
127127
"""
128-
self.deprecate()
128+
# self.deprecate()
129129
payload = self.to_registers()
130130
coils = [bool(int(bit)) for reg in payload for bit in format(reg, "016b")]
131131
return coils
@@ -138,7 +138,7 @@ def build(self) -> list[bytes]:
138138
139139
:returns: The payload buffer as a list
140140
"""
141-
self.deprecate()
141+
# self.deprecate()
142142
buffer = self.encode()
143143
length = len(buffer)
144144
buffer += b"\x00" * (length % 2)
@@ -153,7 +153,7 @@ def add_bits(self, values: list[bool]) -> None:
153153
154154
:param values: The value to add to the buffer
155155
"""
156-
self.deprecate()
156+
# self.deprecate()
157157
value = pack_bitstring(values)
158158
self._payload.append(value)
159159

@@ -162,7 +162,7 @@ def add_8bit_uint(self, value: int) -> None:
162162
163163
:param value: The value to add to the buffer
164164
"""
165-
self.deprecate()
165+
# self.deprecate()
166166
fstring = self._byteorder + "B"
167167
self._payload.append(pack(fstring, value))
168168

@@ -171,7 +171,7 @@ def add_16bit_uint(self, value: int) -> None:
171171
172172
:param value: The value to add to the buffer
173173
"""
174-
self.deprecate()
174+
# self.deprecate()
175175
fstring = self._byteorder + "H"
176176
self._payload.append(pack(fstring, value))
177177

@@ -180,7 +180,7 @@ def add_32bit_uint(self, value: int) -> None:
180180
181181
:param value: The value to add to the buffer
182182
"""
183-
self.deprecate()
183+
# self.deprecate()
184184
fstring = "I"
185185
# fstring = self._byteorder + "I"
186186
p_string = self._pack_words(fstring, value)
@@ -191,7 +191,7 @@ def add_64bit_uint(self, value: int) -> None:
191191
192192
:param value: The value to add to the buffer
193193
"""
194-
self.deprecate()
194+
# self.deprecate()
195195
fstring = "Q"
196196
p_string = self._pack_words(fstring, value)
197197
self._payload.append(p_string)
@@ -201,7 +201,7 @@ def add_8bit_int(self, value: int) -> None:
201201
202202
:param value: The value to add to the buffer
203203
"""
204-
self.deprecate()
204+
# self.deprecate()
205205
fstring = self._byteorder + "b"
206206
self._payload.append(pack(fstring, value))
207207

@@ -210,7 +210,7 @@ def add_16bit_int(self, value: int) -> None:
210210
211211
:param value: The value to add to the buffer
212212
"""
213-
self.deprecate()
213+
# self.deprecate()
214214
fstring = self._byteorder + "h"
215215
self._payload.append(pack(fstring, value))
216216

@@ -219,7 +219,7 @@ def add_32bit_int(self, value: int) -> None:
219219
220220
:param value: The value to add to the buffer
221221
"""
222-
self.deprecate()
222+
# self.deprecate()
223223
fstring = "i"
224224
p_string = self._pack_words(fstring, value)
225225
self._payload.append(p_string)
@@ -229,7 +229,7 @@ def add_64bit_int(self, value: int) -> None:
229229
230230
:param value: The value to add to the buffer
231231
"""
232-
self.deprecate()
232+
# self.deprecate()
233233
fstring = "q"
234234
p_string = self._pack_words(fstring, value)
235235
self._payload.append(p_string)
@@ -239,7 +239,7 @@ def add_16bit_float(self, value: float) -> None:
239239
240240
:param value: The value to add to the buffer
241241
"""
242-
self.deprecate()
242+
# self.deprecate()
243243
fstring = "e"
244244
p_string = self._pack_words(fstring, value)
245245
self._payload.append(p_string)
@@ -249,7 +249,7 @@ def add_32bit_float(self, value: float) -> None:
249249
250250
:param value: The value to add to the buffer
251251
"""
252-
self.deprecate()
252+
# self.deprecate()
253253
fstring = "f"
254254
p_string = self._pack_words(fstring, value)
255255
self._payload.append(p_string)
@@ -259,7 +259,7 @@ def add_64bit_float(self, value: float) -> None:
259259
260260
:param value: The value to add to the buffer
261261
"""
262-
self.deprecate()
262+
# self.deprecate()
263263
fstring = "d"
264264
p_string = self._pack_words(fstring, value)
265265
self._payload.append(p_string)
@@ -269,7 +269,7 @@ def add_string(self, value: str) -> None:
269269
270270
:param value: The value to add to the buffer
271271
"""
272-
self.deprecate()
272+
# self.deprecate()
273273
fstring = self._byteorder + str(len(value)) + "s"
274274
self._payload.append(pack(fstring, value.encode()))
275275

@@ -302,7 +302,7 @@ def __init__(self, payload, byteorder=Endian.LITTLE, wordorder=Endian.BIG):
302302
:param byteorder: The endianness of the payload
303303
:param wordorder: The endianness of the word (when wordcount is >= 2)
304304
"""
305-
self.deprecate()
305+
# self.deprecate()
306306
self._payload = payload
307307
self._pointer = 0x00
308308
self._byteorder = byteorder
@@ -385,36 +385,36 @@ def _unpack_words(self, handle) -> bytes:
385385

386386
def reset(self):
387387
"""Reset the decoder pointer back to the start."""
388-
self.deprecate()
388+
# self.deprecate()
389389
self._pointer = 0x00
390390

391391
def decode_8bit_uint(self):
392392
"""Decode a 8 bit unsigned int from the buffer."""
393-
self.deprecate()
393+
# self.deprecate()
394394
self._pointer += 1
395395
fstring = self._byteorder + "B"
396396
handle = self._payload[self._pointer - 1 : self._pointer]
397397
return unpack(fstring, handle)[0]
398398

399399
def decode_bits(self, package_len=1):
400400
"""Decode a byte worth of bits from the buffer."""
401-
self.deprecate()
401+
# self.deprecate()
402402
self._pointer += package_len
403403
# fstring = self._endian + "B"
404404
handle = self._payload[self._pointer - 1 : self._pointer]
405405
return unpack_bitstring(handle)
406406

407407
def decode_16bit_uint(self):
408408
"""Decode a 16 bit unsigned int from the buffer."""
409-
self.deprecate()
409+
# self.deprecate()
410410
self._pointer += 2
411411
fstring = self._byteorder + "H"
412412
handle = self._payload[self._pointer - 2 : self._pointer]
413413
return unpack(fstring, handle)[0]
414414

415415
def decode_32bit_uint(self):
416416
"""Decode a 32 bit unsigned int from the buffer."""
417-
self.deprecate()
417+
# self.deprecate()
418418
self._pointer += 4
419419
fstring = "I"
420420
handle = self._payload[self._pointer - 4 : self._pointer]
@@ -423,7 +423,7 @@ def decode_32bit_uint(self):
423423

424424
def decode_64bit_uint(self):
425425
"""Decode a 64 bit unsigned int from the buffer."""
426-
self.deprecate()
426+
# self.deprecate()
427427
self._pointer += 8
428428
fstring = "Q"
429429
handle = self._payload[self._pointer - 8 : self._pointer]
@@ -432,23 +432,23 @@ def decode_64bit_uint(self):
432432

433433
def decode_8bit_int(self):
434434
"""Decode a 8 bit signed int from the buffer."""
435-
self.deprecate()
435+
# self.deprecate()
436436
self._pointer += 1
437437
fstring = self._byteorder + "b"
438438
handle = self._payload[self._pointer - 1 : self._pointer]
439439
return unpack(fstring, handle)[0]
440440

441441
def decode_16bit_int(self):
442442
"""Decode a 16 bit signed int from the buffer."""
443-
self.deprecate()
443+
# self.deprecate()
444444
self._pointer += 2
445445
fstring = self._byteorder + "h"
446446
handle = self._payload[self._pointer - 2 : self._pointer]
447447
return unpack(fstring, handle)[0]
448448

449449
def decode_32bit_int(self):
450450
"""Decode a 32 bit signed int from the buffer."""
451-
self.deprecate()
451+
# self.deprecate()
452452
self._pointer += 4
453453
fstring = "i"
454454
handle = self._payload[self._pointer - 4 : self._pointer]
@@ -457,7 +457,7 @@ def decode_32bit_int(self):
457457

458458
def decode_64bit_int(self):
459459
"""Decode a 64 bit signed int from the buffer."""
460-
self.deprecate()
460+
# self.deprecate()
461461
self._pointer += 8
462462
fstring = "q"
463463
handle = self._payload[self._pointer - 8 : self._pointer]
@@ -466,7 +466,7 @@ def decode_64bit_int(self):
466466

467467
def decode_16bit_float(self):
468468
"""Decode a 16 bit float from the buffer."""
469-
self.deprecate()
469+
# self.deprecate()
470470
self._pointer += 2
471471
fstring = "e"
472472
handle = self._payload[self._pointer - 2 : self._pointer]
@@ -475,7 +475,7 @@ def decode_16bit_float(self):
475475

476476
def decode_32bit_float(self):
477477
"""Decode a 32 bit float from the buffer."""
478-
self.deprecate()
478+
# self.deprecate()
479479
self._pointer += 4
480480
fstring = "f"
481481
handle = self._payload[self._pointer - 4 : self._pointer]
@@ -484,7 +484,7 @@ def decode_32bit_float(self):
484484

485485
def decode_64bit_float(self):
486486
"""Decode a 64 bit float(double) from the buffer."""
487-
self.deprecate()
487+
# self.deprecate()
488488
self._pointer += 8
489489
fstring = "d"
490490
handle = self._payload[self._pointer - 8 : self._pointer]
@@ -496,7 +496,7 @@ def decode_string(self, size=1):
496496
497497
:param size: The size of the string to decode
498498
"""
499-
self.deprecate()
499+
# self.deprecate()
500500
self._pointer += size
501501
return self._payload[self._pointer - size : self._pointer]
502502

@@ -505,5 +505,5 @@ def skip_bytes(self, nbytes):
505505
506506
:param nbytes: The number of bytes to skip
507507
"""
508-
self.deprecate()
508+
# self.deprecate()
509509
self._pointer += nbytes

0 commit comments

Comments
 (0)