chore: typing

phil65 · Nov 16, 2024 · 04c8315 · 04c8315
1 parent db038b2
commit 04c8315
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 10 deletions.
diff --git a/mknodes/basenodes/mkbasetable/__init__.py b/mknodes/basenodes/mkbasetable/__init__.py
@@ -101,7 +101,7 @@ def items(self, data):
 
     def add_row(
         self,
-        row: Sequence[str | None | mk.MkNode] | dict[str, str | None],
+        row: Sequence[str | mk.MkNode | None] | dict[str, str | None],
     ):
         if len(row) != len(self.columns):
             msg = "Row to add doesnt have same length as header"

diff --git a/mknodes/basenodes/mkclidoc/__init__.py b/mknodes/basenodes/mkclidoc/__init__.py
@@ -20,7 +20,7 @@ class MkCliDoc(mktemplate.MkTemplate):
 
     def __init__(
         self,
-        target: str | None | argparse.ArgumentParser = None,
+        target: str | argparse.ArgumentParser | None = None,
         *,
         prog_name: str | None = None,
         show_hidden: bool = False,

diff --git a/mknodes/basenodes/mkcontainer/__init__.py b/mknodes/basenodes/mkcontainer/__init__.py
@@ -24,7 +24,7 @@ class MkContainer(mknode.MkNode):
 
     def __init__(
         self,
-        content: list | None | str | mknode.MkNode = None,
+        content: list | str | mknode.MkNode | None = None,
         *,
         block_separator: str = "\n\n",
         **kwargs: Any,

diff --git a/mknodes/basenodes/mkdefinitionlist/__init__.py b/mknodes/basenodes/mkdefinitionlist/__init__.py
@@ -18,7 +18,7 @@ class MkDefinition(mkcontainer.MkContainer):
 
     def __init__(
         self,
-        content: list | None | str | mknode.MkNode = None,
+        content: list | str | mknode.MkNode | None = None,
         title: str = "",
         **kwargs: Any,
     ):

diff --git a/mknodes/basenodes/mkprogressbar/__init__.py b/mknodes/basenodes/mkprogressbar/__init__.py
@@ -21,7 +21,7 @@ def __init__(
         self,
         percentage: int,
         *,
-        label: str | None | Literal[True] = True,
+        label: str | Literal[True] | None = True,
         style: Literal["thin", "candystripe", "candystripe_animated"] | None = None,
         **kwargs: Any,
     ):

diff --git a/mknodes/basenodes/mktasklist/__init__.py b/mknodes/basenodes/mktasklist/__init__.py
@@ -20,7 +20,7 @@ class MkTask(mkcontainer.MkContainer):
     def __init__(
         self,
         value: bool = False,
-        content: list | None | str | mknode.MkNode = None,
+        content: list | str | mknode.MkNode | None = None,
         **kwargs: Any,
     ):
         """Constructor.
@@ -47,7 +47,7 @@ class MkTaskList(mkcontainer.MkContainer):
 
     def __init__(
         self,
-        content: list | None | str | mknode.MkNode = None,
+        content: list | str | mknode.MkNode | None = None,
         **kwargs: Any,
     ):
         """Constructor.

diff --git a/mknodes/jinja/filters.py b/mknodes/jinja/filters.py
@@ -139,4 +139,5 @@ def script_tag(context: runtime.Context, extra_script):
         if extra_script.async_:
             html += " async"
     html += "></script>"
-    return Markup(html).format(url(context, str(extra_script)), extra_script)
+    string = url(context, str(extra_script))
+    return Markup(html).format(string, extra_script)
diff --git a/mknodes/utils/classhelpers.py b/mknodes/utils/classhelpers.py
@@ -130,7 +130,7 @@ def to_dotted_path(
 def list_classes(
     module: types.ModuleType | str | tuple[str, ...],
     *,
-    type_filter: type | None | types.UnionType = None,
+    type_filter: type | types.UnionType | None = None,
     module_filter: str | None = None,
     filter_by___all__: bool = False,
     predicate: Callable[[type], bool] | None = None,
@@ -162,7 +162,7 @@ def list_classes(
 def iter_classes(
     module: types.ModuleType | str | tuple[str, ...],
     *,
-    type_filter: type | None | types.UnionType = None,
+    type_filter: type | types.UnionType | None = None,
     module_filter: str | None = None,
     filter_by___all__: bool = False,
     predicate: Callable[[type], bool] | None = None,