Skip to content

Commit ef0f3ad

Browse files
committed
"Update ruff pre-commit hook
"
1 parent e7ab1aa commit ef0f3ad

7 files changed

Lines changed: 40 additions & 20 deletions

File tree

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ repos:
1010
- id: end-of-file-fixer
1111
- id: trailing-whitespace
1212
- repo: https://github.com/astral-sh/ruff-pre-commit
13-
rev: v0.3.4
13+
rev: v0.15.8
1414
hooks:
1515
- id: ruff-format
1616
- id: ruff

adafruit_fona/adafruit_fona.py

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -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())

adafruit_fona/fona_3g.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ def get_socket(self) -> int:
212212
self._read_line() # eat the rest of '+CIPOPEN' responses
213213

214214
if self._debug:
215-
print("Allocated socket #%d" % socket)
215+
print(f"Allocated socket #{socket}")
216216
return socket
217217

218218
def socket_connect(self, sock_num: int, dest: str, port: int, conn_mode: int = 0) -> bool:
@@ -228,8 +228,10 @@ def socket_connect(self, sock_num: int, dest: str, port: int, conn_mode: int = 0
228228
print(f"*** Socket connect, protocol={conn_mode}, port={port}, ip={dest}")
229229

230230
self._uart.reset_input_buffer()
231-
assert sock_num < FONA_MAX_SOCKETS, "Provided socket exceeds the maximum number of \
231+
assert sock_num < FONA_MAX_SOCKETS, (
232+
"Provided socket exceeds the maximum number of \
232233
sockets for the FONA module."
234+
)
233235
self._send_check_reply(b"AT+CIPHEAD=0", reply=REPLY_OK) # do not show ip header
234236
self._send_check_reply(b"AT+CIPSRIP=0", reply=REPLY_OK) # do not show remote ip/port
235237
self._send_check_reply(b"AT+CIPRXGET=1", reply=REPLY_OK) # manually get data
@@ -251,8 +253,10 @@ def remote_ip(self, sock_num: int) -> str:
251253
:param int sock_num: Desired socket number
252254
"""
253255
self._read_line()
254-
assert sock_num < FONA_MAX_SOCKETS, "Provided socket exceeds the maximum number of \
256+
assert sock_num < FONA_MAX_SOCKETS, (
257+
"Provided socket exceeds the maximum number of \
255258
sockets for the FONA module."
259+
)
256260

257261
self._uart_write(b"AT+CIPOPEN?\r\n")
258262
for _ in range(0, sock_num + 1):
@@ -272,8 +276,10 @@ def socket_write(self, sock_num: int, buffer: bytes, timeout: int = 120000) -> b
272276
:param int timeout: Socket write timeout, in milliseconds. Defaults to 120000ms.
273277
"""
274278
self._read_line()
275-
assert sock_num < FONA_MAX_SOCKETS, "Provided socket exceeds the maximum number of \
279+
assert sock_num < FONA_MAX_SOCKETS, (
280+
"Provided socket exceeds the maximum number of \
276281
sockets for the FONA module."
282+
)
277283

278284
self._uart.reset_input_buffer()
279285

examples/fona_aio_post.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
)
6666
print(response.json())
6767
response.close()
68-
counter = counter + 1
68+
counter += 1
6969
print("OK")
7070
response = None
7171
time.sleep(15)

examples/fona_simpletest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
print("Network Connected!")
5151

5252
print("My IP address is:", fona.local_ip)
53-
print("IP lookup adafruit.com: %s" % fona.get_host_by_name("adafruit.com"))
53+
print(f"IP lookup adafruit.com: {fona.get_host_by_name('adafruit.com')}")
5454

5555
# create requests session
5656
ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, fona)

examples/fona_sms.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
print("Connecting to network...")
2828
time.sleep(1)
2929
print("Connected to network!")
30-
print("RSSI: %ddB" % fona.rssi)
30+
print(f"RSSI: {fona.rssi}dB")
3131

3232
# Text a number
3333
print("Sending SMS...")
@@ -37,7 +37,7 @@
3737

3838
# Ask the FONA how many SMS message it has stored
3939
num_sms = fona.num_sms()
40-
print("%d SMS's on SIM Card" % num_sms)
40+
print(f"{num_sms} SMS's on SIM Card")
4141

4242
# FONA3G SMS memory slots start at 0
4343
if fona.version in {FONA_3G_A, FONA_3G_E}:

examples/fona_sms_response.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
print("Connecting to network...")
3030
time.sleep(1)
3131
print("Connected to network!")
32-
print("RSSI: %ddB" % fona.rssi)
32+
print(f"RSSI: {fona.rssi}dB")
3333

3434
# Enable FONA SMS notification
3535
fona.enable_sms_notification = True

0 commit comments

Comments
 (0)