chore: typing

src/jinjarope/envglobals.py

@@ -10,7 +10,7 @@
 
 
 if TYPE_CHECKING:
-    from collections.abc import Sequence
+    from collections.abc import Callable, Sequence
     import os
 
 
@@ -150,7 +150,7 @@ def utcnow() -> datetime.datetime:
     return datetime.datetime.now(datetime.UTC)
 
 
-ENV_GLOBALS = {
+ENV_GLOBALS: dict[str, Callable[..., Any]] = {
     "range": range,
     "zip": zip,
     "set": set,

src/jinjarope/environment.py

@@ -278,7 +278,10 @@ def add_template_path(self, *path: str | os.PathLike[str]):
             new_loader = loaders.FileSystemLoader(p)
             self._add_loader(new_loader)
 
-    def _add_loader(self, new_loader: jinja2.BaseLoader | dict | str | os.PathLike[str]):
+    def _add_loader(
+        self,
+        new_loader: jinja2.BaseLoader | dict[str, str] | str | os.PathLike[str],
+    ):
         match new_loader:
             case dict():
                 new_loader = loaders.DictLoader(new_loader)

src/jinjarope/iterfilters.py

@@ -2,6 +2,7 @@
 
 from collections.abc import Callable, Generator, Iterable, Mapping
 import itertools
+import operator
 from typing import Any, TypeVar
 
 
@@ -212,14 +213,12 @@ def natsort(
         reverse: Whether to reverse the sort order
         ignore_case: Whether to ignore case for sorting
     """
-    from operator import attrgetter
-
     from natsort import natsorted, ns
 
     alg = ns.IGNORECASE
     if not ignore_case:
         alg = ns.LOWERCASEFIRST
-    key_fn = attrgetter(key) if isinstance(key, str) else key
+    key_fn = operator.attrgetter(key) if isinstance(key, str) else key
     return natsorted(val, key=key_fn, reverse=reverse, alg=alg)
 
 
@@ -246,8 +245,6 @@ def keyfunc(x):
             return x
 
     elif isinstance(key, str):
-        import operator
-
         keyfunc = operator.attrgetter(key)
     else:
         keyfunc = key

src/jinjarope/mdfilters.py

@@ -3,7 +3,7 @@
 from collections.abc import Callable
 import re
 import types
-from typing import Literal
+from typing import Any, Literal
 
 
 HEADER_REGEX = re.compile(r"^(#{1,6}) (.*)", flags=re.MULTILINE)
@@ -113,7 +113,7 @@ def shift_header_levels(text: str, level_shift: int) -> str:
     if not level_shift:
         return text
 
-    def mod_header(match: re.Match, levels: int) -> str:
+    def mod_header(match: re.Match[str], levels: int) -> str:
         header_str = match[1]
         if levels > 0:
             header_str += levels * "#"
@@ -126,7 +126,7 @@ def mod_header(match: re.Match, levels: int) -> str:
 
 def autoref_link(
     text: str | None = None,
-    link: str | types.ModuleType | Callable | None = None,
+    link: str | types.ModuleType | Callable[..., Any] | None = None,
 ) -> str:
     """Create a markdown autorefs-style link (used by MkDocs / MkDocStrings).
 

src/jinjarope/regexfilters.py

@@ -68,7 +68,7 @@ def re_search(
     *args: str,
     ignorecase: bool = False,
     multiline: bool = False,
-) -> list | None | str:
+) -> list[str] | None | str:
     """Perform re.search and return the list of matches or a backref.
 
     Filter adapted from Ansible