cpp-linter 1.12.0__tar.gz → 1.12.1__tar.gz

{cpp_linter-1.12.0 → cpp_linter-1.12.1}/.gitattributes

@@ -6,6 +6,7 @@
 *.py text eol=lf
 *.rst text eol=lf
 *.sh text eol=lf
+*.json text eol=lf
 *.cpp text eol=lf
 *.hpp text eol=lf
 *.yml text eol=lf

{cpp_linter-1.12.0 → cpp_linter-1.12.1}/.github/workflows/labeler.yml

@@ -4,14 +4,12 @@ on:
   pull_request:
     types: [opened, reopened, synchronize]
 
+permissions: {}
+
 jobs:
   # Auto label PRs during a PR event
   auto-label:
-    runs-on: ubuntu-latest
     permissions:
       contents: read
       pull-requests: write
-    steps:
-      - uses: release-drafter/release-drafter@6db134d15f3909ccc9eefd369f02bd1e9cffdf97 # v6.2.0
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    uses: cpp-linter/.github/.github/workflows/pr-labeler.yml@main

{cpp_linter-1.12.0 → cpp_linter-1.12.1}/.github/workflows/release-drafter.yml

@@ -11,11 +11,7 @@ permissions: {}
 jobs:
   # Draft your next Release notes as Pull Requests are merged into the default branch
   draft-release:
-    runs-on: ubuntu-latest
     permissions:
       contents: write
       pull-requests: read
-    steps:
-      - uses: release-drafter/release-drafter@6db134d15f3909ccc9eefd369f02bd1e9cffdf97 # v6.2.0
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    uses: cpp-linter/.github/.github/workflows/release-drafter.yml@main

{cpp_linter-1.12.0 → cpp_linter-1.12.1}/.github/workflows/release.yml

@@ -32,7 +32,7 @@ jobs:
       - name: Build distributions
         run: pipx run build -o dist
       - name: Upload builds as artifacts
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
         with:
           path: dist
           name: wheels
@@ -45,7 +45,7 @@ jobs:
       id-token: write
     steps:
       - name: Download distributions
-        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           name: wheels
           path: dist

{cpp_linter-1.12.0 → cpp_linter-1.12.1}/.github/workflows/tests.yml

@@ -28,7 +28,7 @@ jobs:
       fail-fast: false
       matrix:
         os: ['windows-latest', 'ubuntu-latest']
-        version: ['21', '20', '19', '18', '17', '16', '15', '14', '13', '12', '11', '10', '9']
+        version: ['22', '21', '20', '19', '18', '17', '16', '15', '14', '13', '12', '11']
     env:
       MAX_PYTHON_VERSION: '3.14'
       # only used when installing for a pre-released python version
@@ -60,7 +60,7 @@ jobs:
       #     sudo cmake --install build
 
       - name: Install uv
-        uses: astral-sh/setup-uv@803947b9bd8e9f986429fa0c5a41c367cd732b41 # v7.2.1
+        uses: astral-sh/setup-uv@cec208311dfd045dd5311c1add060b2062131d57 # v8.0.0
         with:
           enable-cache: true
           cache-dependency-glob: "uv.lock"
@@ -112,7 +112,7 @@ jobs:
         run: uvx nox -s test-all -- -m "${PYTEST_ARGS}"
 
       - name: Upload coverage data
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
         with:
           name: coverage-data-${{ runner.os }}-${{ matrix.version }}
           path: .coverage*
@@ -121,13 +121,16 @@ jobs:
   coverage-report:
     needs: [test]
     runs-on: ubuntu-latest
+    environment:
+      name: test-coverage
+      url: https://app.codecov.io/gh/cpp-linter/cpp-linter
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
 
       - name: Download all artifacts
-        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           pattern: coverage-data-*
           merge-multiple: true
@@ -138,7 +141,7 @@ jobs:
           python-version: '3.x'
 
       - name: Install uv
-        uses: astral-sh/setup-uv@803947b9bd8e9f986429fa0c5a41c367cd732b41 # v7.2.1
+        uses: astral-sh/setup-uv@cec208311dfd045dd5311c1add060b2062131d57 # v8.0.0
         with:
           enable-cache: true
           cache-dependency-glob: "uv.lock"
@@ -147,12 +150,12 @@ jobs:
         run: uvx nox -s coverage
 
       - name: Upload comprehensive coverage HTML report
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
         with:
           name: coverage-report
           path: htmlcov/
 
-      - uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
+      - uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
         env:
           CODECOV_TOKEN: ${{secrets.CODECOV_TOKEN}}
         with:

{cpp_linter-1.12.0/cpp_linter.egg-info → cpp_linter-1.12.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cpp-linter
-Version: 1.12.0
+Version: 1.12.1
 Summary: Run clang-format and clang-tidy on a batch of files.
 Author-email: Brendan Doherty <2bndy5@gmail.com>, Xianpeng Shen <xianpeng.shen@gmail.com>
 License-Expression: MIT
@@ -15,14 +15,13 @@ Classifier: Natural Language :: English
 Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Operating System :: MacOS
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development :: Build Tools
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: pygit2>=1.15.1

cpp_linter-1.12.1/cpp_linter/_version.py

@@ -0,0 +1,24 @@
+# file generated by vcs-versioning
+# don't change, don't track in version control
+from __future__ import annotations
+
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
+
+version: str
+__version__: str
+__version_tuple__: tuple[int | str, ...]
+version_tuple: tuple[int | str, ...]
+commit_id: str | None
+__commit_id__: str | None
+
+__version__ = version = '1.12.1'
+__version_tuple__ = version_tuple = (1, 12, 1)
+
+__commit_id__ = commit_id = 'g87b634e51'

{cpp_linter-1.12.0 → cpp_linter-1.12.1}/cpp_linter/clang_tools/__init__.py

@@ -3,7 +3,7 @@ import json
 from pathlib import Path
 import re
 import subprocess
-from typing import Optional, List, Dict, Tuple, cast
+from typing import cast
 import shutil
 
 from ..common_fs import FileObj, FileIOTimeout
@@ -14,7 +14,7 @@ from .clang_format import run_clang_format, FormatAdvice
 from ..cli import Args
 
 
-def assemble_version_exec(tool_name: str, specified_version: str) -> Optional[str]:
+def assemble_version_exec(tool_name: str, specified_version: str) -> str | None:
     """Assembles the command to the executable of the given clang tool based on given
     version information.
 
@@ -37,13 +37,13 @@ def assemble_version_exec(tool_name: str, specified_version: str) -> Optional[st
 def _run_on_single_file(
     file: FileObj,
     log_lvl: int,
-    tidy_cmd: Optional[str],
-    db_json: Optional[List[Dict[str, str]]],
-    format_cmd: Optional[str],
-    format_filter: Optional[FormatFileFilter],
-    tidy_filter: Optional[TidyFileFilter],
+    tidy_cmd: str | None,
+    db_json: list[dict[str, str]] | None,
+    format_cmd: str | None,
+    format_filter: FormatFileFilter | None,
+    tidy_filter: TidyFileFilter | None,
     args: Args,
-) -> Tuple[str, str, Optional[TidyAdvice], Optional[FormatAdvice]]:
+) -> tuple[str, str, TidyAdvice | None, FormatAdvice | None]:
     log_stream = worker_log_init(log_lvl)
     filename = Path(file.name).as_posix()
 
@@ -115,11 +115,11 @@ def _capture_tool_version(cmd: str) -> str:
 
 class ClangVersions:
     def __init__(self) -> None:
-        self.tidy: Optional[str] = None
-        self.format: Optional[str] = None
+        self.tidy: str | None = None
+        self.format: str | None = None
 
 
-def capture_clang_tools_output(files: List[FileObj], args: Args) -> ClangVersions:
+def capture_clang_tools_output(files: list[FileObj], args: Args) -> ClangVersions:
     """Execute and capture all output from clang-tidy and clang-format. This aggregates
     results in the :attr:`~cpp_linter.Globals.OUTPUT`.
 
@@ -150,7 +150,7 @@ def capture_clang_tools_output(files: List[FileObj], args: Args) -> ClangVersion
             ignore_value=args.ignore_tidy,
         )
 
-    db_json: Optional[List[Dict[str, str]]] = None
+    db_json: list[dict[str, str]] | None = None
     if args.database:
         db = Path(args.database)
         if not db.is_absolute():

{cpp_linter-1.12.0 → cpp_linter-1.12.1}/cpp_linter/clang_tools/clang_format.py

@@ -2,7 +2,7 @@
 
 from pathlib import PurePath
 import subprocess
-from typing import List, cast
+from typing import cast
 
 import xml.etree.ElementTree as ET
 
@@ -45,7 +45,7 @@ class FormatReplacementLine:
         self.line = line_numb
 
         #: A list of `FormatReplacement` object(s) representing suggestions.
-        self.replacements: List[FormatReplacement] = []
+        self.replacements: list[FormatReplacement] = []
 
     def __repr__(self):
         return (
@@ -66,7 +66,7 @@ class FormatAdvice(PatchMixin):
         #: The source file that the suggestion concerns.
         self.filename = PurePath(filename).as_posix()
 
-        self.replaced_lines: List[FormatReplacementLine] = []
+        self.replaced_lines: list[FormatReplacementLine] = []
         """A list of `FormatReplacementLine` representing replacement(s)
         on a single line."""
 
@@ -85,7 +85,7 @@ class FormatAdvice(PatchMixin):
         return "clang-format"
 
 
-def tally_format_advice(files: List[FileObj]) -> int:
+def tally_format_advice(files: list[FileObj]) -> int:
     """Returns the sum of clang-format errors"""
     format_checks_failed = 0
     for file_obj in files:
@@ -126,7 +126,7 @@ def parse_format_replacements_xml(
     if not xml_out:
         return format_advice
     ranges = cast(
-        List[List[int]],
+        list[list[int]],
         file_obj.range_of_changed_lines(lines_changed_only, get_ranges=True),
     )
     tree = ET.fromstring(xml_out)
@@ -139,7 +139,8 @@ def parse_format_replacements_xml(
             line, cols = get_line_cnt_from_cols(content, offset)
             is_line_in_ranges = False
             for r in ranges:
-                if line in range(r[0], r[1]):  # range is inclusive
+                # range() is partially inclusive: [r0, r1)
+                if line in range(r[0], r[1] + 1):
                     is_line_in_ranges = True
                     break
             if is_line_in_ranges or lines_changed_only == 0:
@@ -183,7 +184,7 @@ def run_clang_format(
         "--output-replacements-xml",
     ]
     ranges = cast(
-        List[List[int]],
+        list[list[int]],
         file_obj.range_of_changed_lines(lines_changed_only, get_ranges=True),
     )
     for span in ranges:

{cpp_linter-1.12.0 → cpp_linter-1.12.1}/cpp_linter/clang_tools/clang_tidy.py

@@ -5,7 +5,7 @@ import os
 from pathlib import Path, PurePath
 import re
 import subprocess
-from typing import Tuple, Union, List, cast, Optional, Dict, Set
+from typing import cast
 from ..loggers import logger
 from ..common_fs import FileObj
 from .patcher import PatchMixin, ReviewComments, Suggestion
@@ -30,8 +30,8 @@ class TidyNotification:
 
     def __init__(
         self,
-        notification_line: Tuple[str, Union[int, str], Union[int, str], str, str, str],
-        database: Optional[List[Dict[str, str]]] = None,
+        notification_line: tuple[str, int | str, int | str, str, str, str],
+        database: list[dict[str, str]] | None = None,
     ):
         # logger.debug("Creating tidy note from line %s", notification_line)
         (
@@ -78,9 +78,9 @@ class TidyNotification:
         #: The source filename concerning the notification.
         self.filename = rel_path
         #: A `list` of lines for the code-block in the notification.
-        self.fixit_lines: List[str] = []
+        self.fixit_lines: list[str] = []
         #: A list of line numbers where a suggested fix was applied.
-        self.applied_fixes: Set[int] = set()
+        self.applied_fixes: set[int] = set()
 
     @property
     def diagnostic_link(self) -> str:
@@ -105,7 +105,7 @@ class TidyNotification:
 
 
 class TidyAdvice(PatchMixin):
-    def __init__(self, notes: List[TidyNotification]) -> None:
+    def __init__(self, notes: list[TidyNotification]) -> None:
         #: A buffer of the applied fixes from clang-tidy
         super().__init__()
         self.notes = notes
@@ -174,7 +174,7 @@ class TidyAdvice(PatchMixin):
                         review_comments.suggestions.append(suggestion)
 
 
-def tally_tidy_advice(files: List[FileObj]) -> int:
+def tally_tidy_advice(files: list[FileObj]) -> int:
     """Returns the sum of clang-format errors"""
     tidy_checks_failed = 0
     for file_obj in files:
@@ -194,8 +194,8 @@ def run_clang_tidy(
     checks: str,
     lines_changed_only: int,
     database: str,
-    extra_args: List[str],
-    db_json: Optional[List[Dict[str, str]]],
+    extra_args: list[str],
+    db_json: list[dict[str, str]] | None,
     tidy_review: bool,
     style: str,
 ) -> TidyAdvice:
@@ -277,7 +277,7 @@ def run_clang_tidy(
 
 
 def parse_tidy_output(
-    tidy_out: str, database: Optional[List[Dict[str, str]]]
+    tidy_out: str, database: list[dict[str, str]] | None
 ) -> TidyAdvice:
     """Parse clang-tidy stdout.
 
@@ -300,7 +300,7 @@ def parse_tidy_output(
             if " " not in diagnostic_name and "-" in diagnostic_name:
                 notification = TidyNotification(
                     cast(
-                        Tuple[str, Union[int, str], Union[int, str], str, str, str],
+                        tuple[str, int | str, int | str, str, str, str],
                         note_match.groups(),
                     ),
                     database,

{cpp_linter-1.12.0 → cpp_linter-1.12.1}/cpp_linter/clang_tools/patcher.py

@@ -2,7 +2,7 @@
 by the clang tool's output."""
 
 from abc import ABC
-from typing import Optional, Dict, Any, List, Tuple
+from typing import Any
 from pygit2 import Patch  # type: ignore
 from ..common_fs import FileObj
 from pygit2.enums import DiffOption  # type: ignore
@@ -27,7 +27,7 @@ class Suggestion:
         #: The markdown comment about the suggestion.
         self.comment: str = ""
 
-    def serialize_to_github_payload(self) -> Dict[str, Any]:
+    def serialize_to_github_payload(self) -> dict[str, Any]:
         """Serialize this object into a JSON compatible with Github's REST API."""
         assert self.line_end > 0, "ending line number unknown"
         from ..rest_api import COMMENT_MARKER  # workaround circular import
@@ -47,9 +47,9 @@ class ReviewComments:
 
     def __init__(self) -> None:
         #: The list of actual comments
-        self.suggestions: List[Suggestion] = []
+        self.suggestions: list[Suggestion] = []
 
-        self.tool_total: Dict[str, Optional[int]] = {
+        self.tool_total: dict[str, int | None] = {
             "clang-tidy": None,
             "clang-format": None,
         }
@@ -62,7 +62,7 @@ class ReviewComments:
         A `None` value means a review was not requested from the corresponding tool.
         """
 
-        self.full_patch: Dict[str, str] = {"clang-tidy": "", "clang-format": ""}
+        self.full_patch: dict[str, str] = {"clang-tidy": "", "clang-format": ""}
         """The full patch of all the suggestions (including those that will not
         fit within the diff)"""
 
@@ -84,9 +84,9 @@ class ReviewComments:
     def serialize_to_github_payload(
         # avoid circular imports by accepting primitive types (instead of ClangVersions)
         self,
-        tidy_version: Optional[str],
-        format_version: Optional[str],
-    ) -> Tuple[str, List[Dict[str, Any]]]:
+        tidy_version: str | None,
+        format_version: str | None,
+    ) -> tuple[str, list[dict[str, Any]]]:
         """Serialize this object into a summary and list of comments compatible
         with Github's REST API.
 
@@ -143,7 +143,7 @@ class PatchMixin(ABC):
 
     def __init__(self) -> None:
         #: A unified diff of the applied fixes from the clang tool's output
-        self.patched: Optional[bytes] = None
+        self.patched: bytes | None = None
 
     def get_suggestion_help(self, start, end) -> str:
         """Create helpful text about what the suggestion aims to fix.

{cpp_linter-1.12.0 → cpp_linter-1.12.1}/cpp_linter/cli.py

@@ -2,7 +2,7 @@
 
 import argparse
 from collections import UserDict
-from typing import Optional, List, Dict, Any, Sequence, Union
+from typing import Any, Sequence
 
 
 class Args(UserDict):
@@ -14,7 +14,7 @@ class Args(UserDict):
     #: See :std:option:`--database`.
     database: str = ""
     #: See :std:option:`--diff-base`.
-    diff_base: Optional[Union[int, str]] = None
+    diff_base: int | str | None = None
     #: See :std:option:`--ignore-index`.
     ignore_index: bool = False
     #: See :std:option:`--style`.
@@ -27,7 +27,7 @@ class Args(UserDict):
     #: See :std:option:`--version`.
     version: str = ""
     #: See :std:option:`--extensions`.
-    extensions: List[str] = [
+    extensions: list[str] = [
         "c",
         "h",
         "C",
@@ -56,17 +56,17 @@ class Args(UserDict):
     #: See :std:option:`--file-annotations`.
     file_annotations: bool = True
     #: See :std:option:`--extra-arg`.
-    extra_arg: List[str] = []
+    extra_arg: list[str] = []
     #: See :std:option:`--no-lgtm`.
     no_lgtm: bool = True
     #: See :std:option:`files`.
-    files: List[str] = []
+    files: list[str] = []
     #: See :std:option:`--tidy-review`.
     tidy_review: bool = False
     #: See :std:option:`--format-review`.
     format_review: bool = False
     #: See :std:option:`--jobs`.
-    jobs: Optional[int] = 1
+    jobs: int | None = 1
     #: See :std:option:`--ignore-tidy`.
     ignore_tidy: str = ""
     #: See :std:option:`--ignore-format`.
@@ -74,10 +74,10 @@ class Args(UserDict):
     #: See :std:option:`--passive-reviews`.
     passive_reviews: bool = False
     #: A subcommand if provided
-    command: Optional[str] = None
+    command: str | None = None
 
 
-_parser_args: Dict[Sequence[str], Any] = {}
+_parser_args: dict[Sequence[str], Any] = {}
 _parser_args[("-v", "--verbosity")] = dict(
     type=lambda a: a.lower() in ["debug", "10"],
     default="info",
@@ -388,7 +388,7 @@ reviews from requesting or approving changes.""",
 )
 
 
-def _parse_jobs(val: str) -> Optional[int]:
+def _parse_jobs(val: str) -> int | None:
     try:
         jobs = int(val)
     except ValueError as exc:

{cpp_linter-1.12.0 → cpp_linter-1.12.1}/cpp_linter/common_fs/__init__.py

@@ -1,7 +1,7 @@
 from os import environ
 from pathlib import Path
 import time
-from typing import List, Dict, Any, Union, Tuple, Optional, TYPE_CHECKING
+from typing import Any, TYPE_CHECKING
 from pygit2 import DiffHunk  # type: ignore
 from ..loggers import logger
 
@@ -28,32 +28,32 @@ class FileObj:
     def __init__(
         self,
         name: str,
-        additions: Optional[List[int]] = None,
-        diff_chunks: Optional[List[List[int]]] = None,
+        additions: list[int] | None = None,
+        diff_chunks: list[list[int]] | None = None,
     ):
         self.name: str = name  #: The file name
-        self.additions: List[int] = additions or []
+        self.additions: list[int] = additions or []
         """A list of line numbers that contain added changes. This will be empty if
         not focusing on lines changed only."""
-        self.diff_chunks: List[List[int]] = diff_chunks or []
+        self.diff_chunks: list[list[int]] = diff_chunks or []
         """A list of line numbers that define the beginning and ending of hunks in the
         diff. This will be empty if not focusing on lines changed only."""
-        self.lines_added: List[List[int]] = FileObj._consolidate_list_to_ranges(
+        self.lines_added: list[list[int]] = FileObj._consolidate_list_to_ranges(
             additions or []
         )
         """A list of line numbers that define the beginning and ending of ranges that
         have added changes. This will be empty if not focusing on lines changed only.
         """
         #: The results from clang-tidy
-        self.tidy_advice: Optional["TidyAdvice"] = None
+        self.tidy_advice: "TidyAdvice" | None = None
         #: The results from clang-format
-        self.format_advice: Optional["FormatAdvice"] = None
+        self.format_advice: "FormatAdvice" | None = None
 
     def __repr__(self) -> str:
         return f"<FileObj {self.name} added:{self.additions} chunks:{self.diff_chunks}>"
 
     @staticmethod
-    def _consolidate_list_to_ranges(numbers: List[int]) -> List[List[int]]:
+    def _consolidate_list_to_ranges(numbers: list[int]) -> list[list[int]]:
         """A helper function that is only used after parsing the lines from a diff that
         contain additions.
 
@@ -62,7 +62,7 @@ class FileObj:
         :returns: A consolidated sequence of lists. Each list will have 2 items
             describing the starting and ending lines of all line ``numbers``.
         """
-        result: List[List[int]] = []
+        result: list[list[int]] = []
         for i, n in enumerate(numbers):
             if not i:
                 result.append([n])
@@ -75,7 +75,7 @@ class FileObj:
 
     def range_of_changed_lines(
         self, lines_changed_only: int, get_ranges: bool = False
-    ) -> Union[List[int], List[List[int]]]:
+    ) -> list[int] | list[list[int]]:
         """Assemble a list of lines changed.
 
         :param lines_changed_only: A flag to indicate the focus of certain lines.
@@ -100,7 +100,7 @@ class FileObj:
         # we return an empty list (instead of None) here so we can still iterate it
         return []  # type: ignore[return-value]
 
-    def serialize(self) -> Dict[str, Any]:
+    def serialize(self) -> dict[str, Any]:
         """For easy debugging, use this method to serialize the `FileObj` into a json
         compatible `dict`."""
         return {
@@ -111,7 +111,7 @@ class FileObj:
             },
         }
 
-    def is_hunk_contained(self, hunk: DiffHunk) -> Optional[Tuple[int, int]]:
+    def is_hunk_contained(self, hunk: DiffHunk) -> tuple[int, int] | None:
         """Does a given ``hunk`` start and end within a single diff hunk?
 
         This also includes some compensations for hunk headers that are oddly formed.
@@ -134,7 +134,7 @@ class FileObj:
             end = start
         return self.is_range_contained(start, end)
 
-    def is_range_contained(self, start: int, end: int) -> Optional[Tuple[int, int]]:
+    def is_range_contained(self, start: int, end: int) -> tuple[int, int] | None:
         """Does the given ``start`` and ``end`` line numbers fit within a single diff
         hunk?
 
@@ -172,7 +172,7 @@ class FileObj:
         """
         contents = b""
         success = False
-        exception: Union[OSError, FileIOTimeout] = FileIOTimeout(
+        exception: OSError | FileIOTimeout = FileIOTimeout(
             f"Failed to read from file '{self.name}' within "
             + f"{round(timeout_ns / 1_000_000_000, 2)} seconds"
         )
@@ -194,7 +194,7 @@ class FileObj:
 
     def read_write_with_timeout(
         self,
-        data: Union[bytes, bytearray],
+        data: bytes | bytearray,
         timeout_ns: int = 1_000_000_000,
     ) -> bytes:
         """Read then write the entire file's contents.
@@ -210,7 +210,7 @@ class FileObj:
         :raises OSError: When the file could not be opened due to an `OSError`.
         """
         success = False
-        exception: Union[OSError, FileIOTimeout] = FileIOTimeout(
+        exception: OSError | FileIOTimeout = FileIOTimeout(
             f"Failed to read then write file '{self.name}' within "
             + f"{round(timeout_ns / 1_000_000_000, 2)} seconds"
         )
@@ -245,7 +245,7 @@ class FileIOTimeout(Exception):
 
 
 def has_line_changes(
-    lines_changed_only: int, diff_chunks: List[List[int]], additions: List[int]
+    lines_changed_only: int, diff_chunks: list[list[int]], additions: list[int]
 ) -> bool:
     """Does this file actually apply to condition specified by ``lines_changed_only``?
 
@@ -265,7 +265,7 @@ def has_line_changes(
     )
 
 
-def get_line_cnt_from_cols(data: bytes, offset: int) -> Tuple[int, int]:
+def get_line_cnt_from_cols(data: bytes, offset: int) -> tuple[int, int]:
     """Gets a line count and columns offset from a file's absolute offset.
 
     :param data: Bytes content to analyze.