Minor cleanup

Additional changes made by pypgrade which are not relevant for typing

Author: gudnimg

docs/_generate_requests_docstrings.py

@@ -109,7 +109,7 @@ def get_pydantic_fields(cls: type[BaseModel]) -> str:
 
 def parse_file(file_path: str) -> list[ClassInfo]:
     """Parse the file and extract class definitions."""
-    with open(file_path, 'r') as file:
+    with open(file_path) as file:
         lines = file.readlines()
         tree = ast.parse(''.join(lines))
 
@@ -146,7 +146,7 @@ def update_class_docstrings(file_path: str) -> None:
                 full_docstring = parent_docstring + args_section
                 class_info.add_docstring(full_docstring)
 
-    with open(file_path, 'r', encoding="utf-8") as file:
+    with open(file_path, encoding="utf-8") as file:
         lines = file.readlines()
 
     updated_lines = []

examples/usb/download_file.py

@@ -21,7 +21,7 @@ async def main() -> None:
         file_data = await client.download_file(file_location)
         end_s = time.time()
         duration = end_s - start_s
-        speed = round(len(file_data) / ((duration)) / 1000, 2)
+        speed = round(len(file_data) / duration / 1000, 2)
 
         print(f"Speed {speed} KB/s")
 

smpclient/transport/serial.py

@@ -227,7 +227,7 @@ async def read_serial(self, delimiter: bytes | None = None) -> bytes:
             try:
                 first_match, remaining_data = self._serial_buffer.split(delimiter, 1)
             except ValueError:
-                return bytes()
+                return b''
             self._serial_buffer = remaining_data
             return bytes(first_match)
 

tests/fixtures/analyze-mcuboot-img.py

@@ -107,7 +107,7 @@ def main():
     print('Initial image bytes:')
     start = img_header.hdr_size
     end = start + min(20, img_header.img_size)
-    print('\t' + ' '.join('{:02x}'.format(b) for b in contents[start:end]))
+    print('\t' + ' '.join(f'{b:02x}' for b in contents[start:end]))
 
     tlv_info_offset = img_header.hdr_size + img_header.img_size
     tlv_info = TLVInfo(*struct.unpack_from(TLV_INFO_FMT, contents, offset=tlv_info_offset))
@@ -117,11 +117,11 @@ def main():
     tlv_num = 0
     while tlv_off < tlv_end:
         tlv_hdr = TLVHeader(*struct.unpack_from(TLV_HDR_FMT, contents, offset=tlv_off))
-        print('TLV {}:'.format(tlv_num), tlv_hdr)
+        print(f'TLV {tlv_num}:', tlv_hdr)
         if tlv_hdr.len <= 32:
             start = tlv_off + TLV_HDR_SIZE
             end = start + tlv_hdr.len
-            print('\t' + ' '.join('{:02x}'.format(b) for b in contents[start:end]))
+            print('\t' + ' '.join(f'{b:02x}' for b in contents[start:end]))
         tlv_off += TLV_HDR_SIZE + tlv_hdr.len
         tlv_num += 1
 

tests/test_smp_client.py

@@ -1,6 +1,5 @@
 """Tests for `SMPClient`."""
 
-import sys
 from hashlib import sha256
 from pathlib import Path
 from unittest.mock import AsyncMock, PropertyMock, call, patch
@@ -39,24 +38,6 @@
 from smpclient.requests.os_management import ResetWrite
 from smpclient.transport.serial import SMPSerialTransport
 
-if sys.version_info < (3, 10):
-    from typing import Any
-
-    async def anext(iterator: Any, default: Any = None) -> Any:
-        try:
-            return await iterator.__anext__()
-        except StopAsyncIteration:
-            if default is None:
-                raise
-            return default
-
-    def aiter(iterable: Any) -> Any:
-        if hasattr(iterable, '__aiter__'):
-            return iterable.__aiter__()
-        else:
-            raise TypeError(f"{iterable} is not async iterable")
-
-
 class SMPMockTransport:
     """Satisfies the `SMPTransport` `Protocol`."""