Update type annotations

Author: RobertoPrevato

neoteroi/mkdocs/cards/domain.py

@@ -1,17 +1,16 @@
 from dataclasses import dataclass
-from typing import List, Optional
 
 from neoteroi.mkdocs.markdown.images import Image
 
 
 @dataclass
 class CardItem:
     title: str
-    url: Optional[str] = None
-    content: Optional[str] = None
-    icon: Optional[str] = None
-    key: Optional[str] = None
-    image: Optional[Image] = None
+    url: str | None = None
+    content: str | None = None
+    icon: str | None = None
+    key: str | None = None
+    image: Image | None = None
 
     def __post_init__(self):
         if self.image and not self.image.alt:
@@ -20,4 +19,4 @@ def __post_init__(self):
 
 @dataclass
 class Cards:
-    items: List[CardItem]
+    items: list[CardItem]

neoteroi/mkdocs/contribs/__init__.py

@@ -13,7 +13,6 @@
 from fnmatch import fnmatch
 from pathlib import Path
 from subprocess import CalledProcessError
-from typing import List
 
 from mkdocs.config import config_options as c
 from mkdocs.plugins import BasePlugin
@@ -38,7 +37,7 @@ def __init__(self) -> None:
         self._git_reader = GitContributionsReader()
         self._txt_reader = TXTContributionsReader()
 
-    def get_contributors(self, file_path: Path) -> List[Contributor]:
+    def get_contributors(self, file_path: Path) -> list[Contributor]:
         git_history_contributors = self._git_reader.get_contributors(file_path)
         configured_contributors = self._txt_reader.get_contributors(file_path)
         return list(
@@ -71,7 +70,7 @@ def __init__(self) -> None:
 
     def _merge_contributor_by_email(
         self,
-        contributors: List[Contributor],
+        contributors: list[Contributor],
         contributor: Contributor,
         contributor_info: dict,
     ) -> bool:
@@ -97,7 +96,7 @@ def _merge_contributor_by_email(
 
         return False
 
-    def _get_contributors(self, page_file: File) -> List[Contributor]:
+    def _get_contributors(self, page_file: File) -> list[Contributor]:
         results = []
         contributors = self._contribs_reader.get_contributors(
             Path("docs") / page_file.src_path

neoteroi/mkdocs/contribs/domain.py

@@ -2,21 +2,20 @@
 from dataclasses import dataclass
 from datetime import datetime
 from pathlib import Path
-from typing import List, Optional
 
 
 @dataclass
 class Contributor:
     name: str
     email: str
     count: int = -1
-    image: Optional[str] = None
-    key: Optional[str] = None
+    image: str | None = None
+    key: str | None = None
 
 
 class ContributionsReader(ABC):
     @abstractmethod
-    def get_contributors(self, file_path: Path) -> List[Contributor]:
+    def get_contributors(self, file_path: Path) -> list[Contributor]:
         """Obtains the list of contributors for a file with the given path."""
 
     @abstractmethod

neoteroi/mkdocs/contribs/git.py

@@ -9,7 +9,7 @@
 import subprocess
 from datetime import datetime
 from pathlib import Path
-from typing import Iterable, List, Tuple
+from typing import Iterable
 
 from dateutil.parser import ParserError
 from dateutil.parser import parse as parse_date
@@ -26,7 +26,7 @@ def _decode(self, value: bytes) -> str:
         except UnicodeDecodeError:
             return value.decode("ISO-8859-1")
 
-    def _parse_name_and_email(self, name_and_email) -> Tuple[str, str]:
+    def _parse_name_and_email(self, name_and_email) -> tuple[str, str]:
         match = self._name_email_rx.search(name_and_email)
         if match:
             name = match.groupdict()["name"].strip()
@@ -41,7 +41,7 @@ def parse_committers(self, output: str) -> Iterable[Contributor]:
             name, email = self._parse_name_and_email(name_and_email)
             yield Contributor(name, email, int(count))
 
-    def get_contributors(self, file_path: Path) -> List[Contributor]:
+    def get_contributors(self, file_path: Path) -> list[Contributor]:
         """
         Obtains the list of contributors for a file with the given path,
         using the Git CLI.

neoteroi/mkdocs/contribs/html.py

@@ -5,7 +5,6 @@
 import xml.etree.ElementTree as etree
 from dataclasses import dataclass
 from datetime import datetime
-from typing import List
 from xml.etree.ElementTree import tostring as xml_to_str
 
 from neoteroi.mkdocs.contribs.domain import Contributor
@@ -25,7 +24,7 @@ class ContribsViewOptions:
 
 
 def contribution_stats_to_element(
-    contributors: List[Contributor],
+    contributors: list[Contributor],
     last_commit_date: datetime,
     options: ContribsViewOptions,
 ) -> etree.Element:
@@ -85,7 +84,7 @@ def contribution_stats_to_element(
 
 
 def render_contribution_stats(
-    contributors: List[Contributor],
+    contributors: list[Contributor],
     last_commit_date: datetime,
     options: ContribsViewOptions,
 ) -> str:

neoteroi/mkdocs/contribs/txt.py

@@ -2,7 +2,7 @@
 import re
 from datetime import datetime
 from pathlib import Path
-from typing import Iterable, List, Tuple
+from typing import Iterable
 
 from dateutil.parser import parse
 
@@ -30,7 +30,7 @@ class TXTContributionsReader(ContributionsReader):
         r"^\s*Last\smodified\stime:\s(?P<value>.+)$", re.IGNORECASE | re.MULTILINE
     )
 
-    def _parse_value(self, value: str) -> Tuple[str, str, int]:
+    def _parse_value(self, value: str) -> tuple[str, str, int]:
         match = self._contrib_rx.search(value)
         if match:
             values = match.groupdict()
@@ -51,7 +51,7 @@ def _get_contributors_from_txt_file(self, file_path: Path) -> Iterable[Contribut
             if name and email:
                 yield Contributor(name, email, count)
 
-    def get_contributors(self, file_path: Path) -> List[Contributor]:
+    def get_contributors(self, file_path: Path) -> list[Contributor]:
         """
         Obtains the list of contributors from a txt file with the given path.
         The file contents should look like:

neoteroi/mkdocs/markdown/__init__.py

@@ -4,7 +4,6 @@
 """
 
 import re
-from typing import Dict, Tuple
 
 _PROPS_RE = re.compile(
     r"""\s?((?P<name>[^\s\=]+)=(?P<quot>"|')(?P<value>[^\"\']+)(?P=quot))""",
@@ -14,7 +13,7 @@
 
 def parse_props(
     line: str, prefix: str = "", bool_attrs: bool = False
-) -> Dict[str, str]:
+) -> dict[str, str]:
     """
     Parses a line describing properties, in this form:
 
@@ -49,7 +48,7 @@ def parse_props(
     return props
 
 
-def extract_props(line: str, prefix: str = "") -> Tuple[str, Dict[str, str]]:
+def extract_props(line: str, prefix: str = "") -> tuple[str, dict[str, str]]:
     """
     Extracts properties like the `parse_props` function, but
     also returns the original line with properties removed.

neoteroi/mkdocs/markdown/images.py

@@ -1,16 +1,15 @@
 import xml.etree.ElementTree as etree
 from dataclasses import dataclass
-from typing import Optional
 
 from .utils import create_instance
 
 
 @dataclass
 class Image:
     url: str
-    height: Optional[int] = None
-    width: Optional[int] = None
-    alt: Optional[str] = None
+    height: int | None = None
+    width: int | None = None
+    alt: str | None = None
 
     @classmethod
     def from_obj(cls, obj):

neoteroi/mkdocs/markdown/processors.py

@@ -16,7 +16,7 @@
 import textwrap
 import xml.etree.ElementTree as etree
 from abc import ABC, abstractmethod
-from typing import Iterable, List, Optional
+from typing import Iterable
 
 from markdown.blockprocessors import BlockProcessor
 
@@ -34,7 +34,7 @@
 logger = logging.getLogger("MARKDOWN")
 
 
-def find_closing_fragment_index(pattern: re.Pattern, blocks: List[str]) -> int:
+def find_closing_fragment_index(pattern: re.Pattern, blocks: list[str]) -> int:
     for index, block in enumerate(blocks):
         if pattern.search(block):
             return index
@@ -128,7 +128,7 @@ def render(self, parent, data, props):
                 f"Could not render a {self.name} block. Please correct the input.",
             )
 
-    def get_match(self, pattern, blocks) -> Optional[re.Match]:
+    def get_match(self, pattern, blocks) -> re.Match | None:
         first_block = blocks.pop(0)
         new_lines = []
         match = None
@@ -159,7 +159,7 @@ class SourceBlockProcessor(BlockProcessor, BaseProcessor):
     [timeline(https://.../example.json)]
     """
 
-    _pattern: Optional[re.Pattern] = None
+    _pattern: re.Pattern | None = None
 
     @property
     def pattern(self) -> re.Pattern:
@@ -233,8 +233,8 @@ class EmbeddedBlockProcessor(BlockProcessor, BaseProcessor):
     The source of data in this case is always coming as a string.
     """
 
-    _start_pattern: Optional[re.Pattern] = None
-    _end_pattern: Optional[re.Pattern] = None
+    _start_pattern: re.Pattern | None = None
+    _end_pattern: re.Pattern | None = None
 
     @property
     def start_pattern(self) -> re.Pattern:

neoteroi/mkdocs/markdown/tables/__init__.py

@@ -1,5 +1,5 @@
 import re
-from typing import Any, Dict, Iterable, List, Optional, Tuple, Type, TypeVar
+from typing import Any, Iterable, Type, TypeVar
 
 _TABLE_LINE_PATTERN = re.compile(r"\s?\|([^\|]+)")
 _TABLE_SEPARATOR_LINE_PATTERN = re.compile(r"^[-:\s\|]*$")
@@ -20,7 +20,7 @@ def __init__(
         )
 
     @property
-    def rows(self) -> Tuple[List[Any], ...]:
+    def rows(self) -> tuple[list[Any], ...]:
         return self._rows
 
     def __str__(self) -> str:
@@ -71,14 +71,14 @@ def __repr__(self) -> str:
         )
 
     @property
-    def headers(self) -> Tuple[str, ...]:
+    def headers(self) -> tuple[str, ...]:
         return self._headers
 
     @property
-    def records(self) -> Tuple[Tuple[str, ...], ...]:
+    def records(self) -> tuple[tuple[str, ...], ...]:
         return self._records
 
-    def items(self) -> Iterable[Dict[str, str]]:
+    def items(self) -> Iterable[dict[str, str]]:
         properties = {index: header for index, header in enumerate(self.headers)}
 
         for record in self.records:
@@ -110,9 +110,9 @@ def __getitem__(self, key):
 T = TypeVar("T", bound=Table)
 
 
-def read_table(markdown: str, cls: Type[T] = Table) -> Optional[T]:
-    headers: List[str] = []
-    records: List[List[str]] = []
+def read_table(markdown: str, cls: Type[T] = Table) -> T | None:
+    headers: list[str] = []
+    records: list[list[str]] = []
 
     for line in markdown.splitlines():
         if _TABLE_SEPARATOR_LINE_PATTERN.match(line):