@@ -404,7 +404,7 @@ def gps(self, gps_on: bool = False) -> bool:
404404
405405 def pretty_ip (self , ip : ReadableBuffer ) -> str :
406406 """Converts a bytearray IP address to a dotted-quad string for printing"""
407- return "%d.%d.%d.%d" % ( ip [0 ], ip [1 ], ip [2 ], ip [3 ])
407+ return f" { ip [0 ]} . { ip [1 ]} . { ip [2 ]} . { ip [3 ]} "
408408
409409 def unpretty_ip (self , ip : str ) -> bytes :
410410 """Converts a dotted-quad string to a bytearray IP address"""
@@ -616,16 +616,18 @@ def get_socket(self) -> int:
616616 for _ in range (allocated_socket , FONA_MAX_SOCKETS ):
617617 self ._read_line (100 )
618618 if self ._debug :
619- print ("Allocated socket #%d" % allocated_socket )
619+ print (f "Allocated socket #{ allocated_socket } " )
620620 return allocated_socket
621621
622622 def remote_ip (self , sock_num : int ) -> str :
623623 """Returns the IP address of the remote server.
624624
625625 :param int sock_num: Desired socket.
626626 """
627- assert sock_num < FONA_MAX_SOCKETS , "Provided socket exceeds the maximum number of \
627+ assert sock_num < FONA_MAX_SOCKETS , (
628+ "Provided socket exceeds the maximum number of \
628629 sockets for the FONA module."
630+ )
629631 self ._uart_write (b"AT+CIPSTATUS=" + str (sock_num ).encode () + b"\r \n " )
630632 self ._read_line (100 )
631633
@@ -637,8 +639,10 @@ def socket_status(self, sock_num: int) -> bool:
637639
638640 :param int sock_num: Desired socket number.
639641 """
640- assert sock_num < FONA_MAX_SOCKETS , "Provided socket exceeds the maximum number of \
642+ assert sock_num < FONA_MAX_SOCKETS , (
643+ "Provided socket exceeds the maximum number of \
641644 sockets for the FONA module."
645+ )
642646 if not self ._send_check_reply (b"AT+CIPSTATUS" , reply = REPLY_OK , timeout = 100 ):
643647 return False
644648 self ._read_line ()
@@ -665,8 +669,10 @@ def socket_available(self, sock_num: int) -> int:
665669
666670 :param int sock_num: Desired socket to return bytes available from.
667671 """
668- assert sock_num < FONA_MAX_SOCKETS , "Provided socket exceeds the maximum number of \
672+ assert sock_num < FONA_MAX_SOCKETS , (
673+ "Provided socket exceeds the maximum number of \
669674 sockets for the FONA module."
675+ )
670676 if not self ._send_parse_reply (
671677 b"AT+CIPRXGET=4," + str (sock_num ).encode (),
672678 b"+CIPRXGET: 4," + str (sock_num ).encode () + b"," ,
@@ -696,8 +702,10 @@ def socket_connect(
696702 print (f"*** Socket connect, protocol={ conn_mode } , port={ port } , ip={ dest } " )
697703
698704 self ._uart .reset_input_buffer ()
699- assert sock_num < FONA_MAX_SOCKETS , "Provided socket exceeds the maximum number of \
705+ assert sock_num < FONA_MAX_SOCKETS , (
706+ "Provided socket exceeds the maximum number of \
700707 sockets for the FONA module."
708+ )
701709
702710 # Query local IP Address
703711 self ._uart_write (b"AT+CIFSR\r \n " )
@@ -724,9 +732,11 @@ def socket_close(self, sock_num: int) -> bool:
724732 :param int sock_num: Desired socket number.
725733 """
726734 if self ._debug :
727- print ("*** Closing socket #%d" % sock_num )
728- assert sock_num < FONA_MAX_SOCKETS , "Provided socket exceeds the maximum number of \
735+ print (f"*** Closing socket #{ sock_num } " )
736+ assert sock_num < FONA_MAX_SOCKETS , (
737+ "Provided socket exceeds the maximum number of \
729738 sockets for the FONA module."
739+ )
730740
731741 self ._uart_write (b"AT+CIPCLOSE=" + str (sock_num ).encode () + b"\r \n " )
732742 self ._read_line (3000 )
@@ -746,8 +756,10 @@ def socket_read(self, sock_num: int, length: int) -> bytearray:
746756 :param int length: Desired length to read.
747757 """
748758 self ._read_line ()
749- assert sock_num < FONA_MAX_SOCKETS , "Provided socket exceeds the maximum number of \
759+ assert sock_num < FONA_MAX_SOCKETS , (
760+ "Provided socket exceeds the maximum number of \
750761 sockets for the FONA module."
762+ )
751763 if self ._debug :
752764 print ("* socket read" )
753765
@@ -768,8 +780,10 @@ def socket_write(self, sock_num: int, buffer: bytes, timeout: int = 3000) -> boo
768780 :param int timeout: Socket write timeout, in milliseconds.
769781 """
770782 self ._read_line ()
771- assert sock_num < FONA_MAX_SOCKETS , "Provided socket exceeds the maximum number of \
783+ assert sock_num < FONA_MAX_SOCKETS , (
784+ "Provided socket exceeds the maximum number of \
772785 sockets for the FONA module."
786+ )
773787
774788 self ._uart .reset_input_buffer ()
775789 self ._uart_write (b"AT+CIPSEND=" + str (sock_num ).encode ())
0 commit comments