Skip to content

Commit a9d8514

Browse files
authored
Merge pull request #49 from Emantor/fix/deprecation
Fix DepreactionWarning for warn method
2 parents 435661b + 318896c commit a9d8514

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

xmodem/__init__.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ def callback(total_packets, success_count, error_count)
360360
self.log.error('send error: expected ACK; got %r', char)
361361
error_count += 1
362362
if error_count > retry:
363-
self.log.warn('EOT was not ACKd, aborting transfer')
363+
self.log.warning('EOT was not ACKd, aborting transfer')
364364
self.abort(timeout=timeout)
365365
return False
366366

@@ -442,7 +442,7 @@ def recv(self, stream, crc_mode=1, retry=16, timeout=60, delay=1, quiet=0):
442442

443443
char = self.getc(1, timeout)
444444
if char is None:
445-
self.log.warn('recv error: getc timeout in start sequence')
445+
self.log.warning('recv error: getc timeout in start sequence')
446446
error_count += 1
447447
continue
448448
elif char == SOH:
@@ -501,7 +501,7 @@ def recv(self, stream, crc_mode=1, retry=16, timeout=60, delay=1, quiet=0):
501501
'got {0!r}'.format(char))
502502
if not quiet:
503503
print(err_msg, file=sys.stderr)
504-
self.log.warn(err_msg)
504+
self.log.warning(err_msg)
505505
error_count += 1
506506
if error_count > retry:
507507
self.log.info('error_count reached %d, aborting.',
@@ -515,13 +515,13 @@ def recv(self, stream, crc_mode=1, retry=16, timeout=60, delay=1, quiet=0):
515515
self.log.debug('recv: data block %d', sequence)
516516
seq1 = self.getc(1, timeout)
517517
if seq1 is None:
518-
self.log.warn('getc failed to get first sequence byte')
518+
self.log.warning('getc failed to get first sequence byte')
519519
seq2 = None
520520
else:
521521
seq1 = ord(seq1)
522522
seq2 = self.getc(1, timeout)
523523
if seq2 is None:
524-
self.log.warn('getc failed to get second sequence byte')
524+
self.log.warning('getc failed to get second sequence byte')
525525
else:
526526
# second byte is the same as first as 1's complement
527527
seq2 = 0xff - ord(seq2)
@@ -551,7 +551,7 @@ def recv(self, stream, crc_mode=1, retry=16, timeout=60, delay=1, quiet=0):
551551
continue
552552

553553
# something went wrong, request retransmission
554-
self.log.warn('recv error: purge, requesting retransmission (NAK)')
554+
self.log.warning('recv error: purge, requesting retransmission (NAK)')
555555
while True:
556556
# When the receiver wishes to <nak>, it should call a "PURGE"
557557
# subroutine, to wait for the line to clear. Recall the sender
@@ -578,7 +578,7 @@ def _verify_recv_checksum(self, crc_mode, data):
578578
our_sum = self.calc_crc(data)
579579
valid = bool(their_sum == our_sum)
580580
if not valid:
581-
self.log.warn('recv error: checksum fail '
581+
self.log.warning('recv error: checksum fail '
582582
'(theirs=%04x, ours=%04x), ',
583583
their_sum, our_sum)
584584
else:
@@ -589,7 +589,7 @@ def _verify_recv_checksum(self, crc_mode, data):
589589
our_sum = self.calc_checksum(data)
590590
valid = their_sum == our_sum
591591
if not valid:
592-
self.log.warn('recv error: checksum fail '
592+
self.log.warning('recv error: checksum fail '
593593
'(theirs=%02x, ours=%02x)',
594594
their_sum, our_sum)
595595
return valid, data

0 commit comments

Comments
 (0)