Make it more modern

Author: Kludex

.github/workflows/main.yml

@@ -28,7 +28,7 @@ jobs:
         run: uv sync --python ${{ matrix.python-version }} --frozen
 
       - name: Run linters
-        run: scripts/lint
+        run: scripts/check
 
       - name: Run tests
         run: scripts/test

multipart/multipart.py

@@ -162,6 +162,7 @@ class MultipartState(IntEnum):
     b"!#$%&'*+-.^_`|~")
 # fmt: on
 
+
 def parse_options_header(value: str | bytes | None) -> tuple[bytes, dict[bytes, bytes]]:
     """Parses a Content-Type header into a value in the following format: (content_type, {parameters})."""
     # Uses email.message.Message to parse the header as described in PEP 594.
@@ -508,7 +509,7 @@ def _get_disk_file(self) -> BufferedRandom:
             if isinstance(tmp_file.name, str):
                 fname = tmp_file.name.encode(sys.getfilesystemencoding())
             else:
-                fname = cast(bytes, tmp_file.name)
+                fname = cast(bytes, tmp_file.name)  # pragma: no cover
 
         self._actual_file_name = fname
         return tmp_file
@@ -597,7 +598,7 @@ def __init__(self) -> None:
         self.callbacks: QuerystringCallbacks | OctetStreamCallbacks | MultipartCallbacks = {}
 
     def callback(
-        self, name: CALLBACK_NAMES, data: bytes | None = None, start: int | None = None, end: int | None = None
+        self, name: CallbackName, data: bytes | None = None, start: int | None = None, end: int | None = None
     ) -> None:
         """This function calls a provided callback with some data.  If the
         callback is not set, will do nothing.
@@ -626,7 +627,7 @@ def callback(
             self.logger.debug("Calling %s with no data", on_name)
             func()
 
-    def set_callback(self, name: CALLBACK_NAMES, new_func: Callable[..., Any] | None) -> None:
+    def set_callback(self, name: CallbackName, new_func: Callable[..., Any] | None) -> None:
         """Update the function for a callback.  Removes from the callbacks dict
         if new_func is None.
 

scripts/README.md

@@ -0,0 +1,8 @@
+# Development Scripts
+
+* `scripts/setup` - Install dependencies.
+* `scripts/test` - Run the test suite.
+* `scripts/lint` - Run the code format.
+* `scripts/check` - Run the lint in check mode, and the type checker.
+
+Styled after GitHub's ["Scripts to Rule Them All"](https://github.com/github/scripts-to-rule-them-all).

scripts/check

@@ -0,0 +1,9 @@
+#!/bin/sh -e
+
+set -x
+
+SOURCE_FILES="multipart tests"
+
+uvx ruff format --check --diff $SOURCE_FILES
+uvx ruff check $SOURCE_FILES
+uvx --from types-PyYAML mypy $SOURCE_FILES

scripts/setup

@@ -0,0 +1,3 @@
+#!/bin/sh -ex
+
+uv sync --frozen

tests/test_multipart.py

@@ -713,6 +713,7 @@ def test_not_aligned(self) -> None:
     "single_field_single_file",
 ]
 
+
 def split_all(val: bytes) -> Iterator[tuple[bytes, bytes]]:
     """
     This function will split an array all possible ways.  For example:
@@ -863,7 +864,7 @@ def test_random_splitting(self) -> None:
             self.assert_field(b"field", b"test1")
             self.assert_file(b"file", b"file.txt", b"test2")
 
-    @parametrize("param", [ t for t in http_tests if t["name"] in single_byte_tests])
+    @parametrize("param", [t for t in http_tests if t["name"] in single_byte_tests])
     def test_feed_single_bytes(self, param: TestParams) -> None:
         """
         This test parses multipart bodies 1 byte at a time.