format

Author: felix-hilden

src/sphinx_codeautolink/extension/block.py

@@ -3,10 +3,10 @@
 from __future__ import annotations
 
 import re
+from collections.abc import Callable
 from copy import copy
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Callable
 
 from bs4 import BeautifulSoup
 from docutils import nodes
@@ -263,7 +263,7 @@ def _format_source_for_error(
         guides[ix] = "block source:"
         pad = max(len(i) + 1 for i in guides)
         guides = [g.ljust(pad) for g in guides]
-        return "\n".join([g + s for g, s in zip(guides, lines)])
+        return "\n".join([g + s for g, s in zip(guides, lines, strict=True)])
 
     def _parsing_error_msg(self, error: Exception, language: str, source: str) -> str:
         return "\n".join(

src/sphinx_codeautolink/extension/directive.py

@@ -136,5 +136,5 @@ def unknown_visit(self, node) -> None:
         if isinstance(node, DeferredExamples):
             # Remove surrounding paragraph too
             node.parent.parent.remove(node.parent)
-        if isinstance(node, (ConcatMarker, PrefaceMarker, SkipMarker)):
+        if isinstance(node, ConcatMarker | PrefaceMarker | SkipMarker):
             node.parent.remove(node)

src/sphinx_codeautolink/extension/resolve.py

@@ -2,13 +2,14 @@
 
 from __future__ import annotations
 
+from collections.abc import Callable
 from contextlib import suppress
 from dataclasses import dataclass
 from functools import cache
 from importlib import import_module
 from inspect import isclass, isroutine
 from types import UnionType
-from typing import Any, Callable, Union, get_type_hints
+from typing import Any, Union, get_type_hints
 
 from sphinx_codeautolink.parse import Name, NameBreak
 

src/sphinx_codeautolink/parse.py

@@ -432,7 +432,7 @@ def visit_Import(self, node: ast.Import | ast.ImportFrom, prefix: str = "") -> N
         if prefix:
             self.save_access(Access(LinkContext.import_from, [], prefix_components))
 
-        for import_name, alias in zip(import_names, aliases):
+        for import_name, alias in zip(import_names, aliases, strict=True):
             if not import_star:
                 components = [
                     Component(n, *linenos(node), "load") for n in import_name.split(".")
@@ -561,7 +561,7 @@ def visit_MatchClass(self, node: ast.AST) -> None:
                 accesses.append(access)
 
         assigns = []
-        for attr, pattern in zip(node.kwd_attrs, node.kwd_patterns):
+        for attr, pattern in zip(node.kwd_attrs, node.kwd_patterns, strict=True):
             target = self.visit(pattern)
             attr_comps = [
                 Component(NameBreak.call, *linenos(node), "load"),

tests/extension/src/test_project/__init__.py

@@ -1,7 +1,5 @@
 """Docstring."""
 
-from typing import Optional, Union
-
 from .sub import SubBar, subfoo  # noqa: F401
 
 
@@ -31,15 +29,15 @@ def bar() -> Foo:
     """Bar test function."""
 
 
-def optional() -> Optional[Foo]:
+def optional() -> Foo | None:
     """Return optional type."""
 
 
-def optional_manual() -> Union[None, Foo]:
+def optional_manual() -> None | Foo:
     """Return manually constructed optional type."""
 
 
-def optional_counter() -> Union[Foo, Baz]:
+def optional_counter() -> Foo | Baz:
     """Failing case for incorrect optional type handling."""
 
 

tests/parse/_util.py

@@ -26,7 +26,7 @@ def wrapper(self):
             print(f"components={components}, code_str={code_str}")
         print("\nParsed names:")
         [print(n) for n in names]
-        for n, e in zip(names, expected):
+        for n, e in zip(names, expected, strict=True):
             s = ".".join(c for c in n.import_components)
             assert s == e[0], f"Wrong import! Expected\n{e}\ngot\n{n}"
             assert n.code_str == e[1], f"Wrong code str! Expected\n{e}\ngot\n{n}"