Types improvements

Author: m-aciek

generate.py

@@ -13,6 +13,7 @@
 from datetime import datetime, timezone
 from pathlib import Path
 from tempfile import TemporaryDirectory
+from typing import cast
 
 from git import Repo
 from jinja2 import Template
@@ -22,7 +23,6 @@
 import visitors
 from completion import branches_from_devguide, get_completion
 
-completion_progress = []
 generation_time = datetime.now(timezone.utc)
 
 
@@ -53,7 +53,15 @@ def get_completion_progress() -> (
             built_on_docs_python_org = language in languages_built
             in_switcher = languages_built.get(language)
             if not repo:
-                yield language, repo, 0.0, 0, 0, built_on_docs_python_org, in_switcher
+                yield (
+                    language,
+                    cast(str, repo),
+                    0.0,
+                    0,
+                    0,
+                    built_on_docs_python_org,
+                    in_switcher,
+                )
                 continue
             completion_number, translators_number = get_completion(clones_dir, repo)
             if built_on_docs_python_org:

repositories.py

@@ -1,23 +1,26 @@
 import pathlib
 import re
-from typing import Generator, Optional
+from collections.abc import Iterator
 
 from docutils import core
 from docutils.nodes import table, row
 
 
 def get_languages_and_repos(
     devguide_dir: pathlib.Path,
-) -> Generator[tuple[str, Optional[str]], None, None]:
+) -> Iterator[tuple[str, str | None]]:
     translating = devguide_dir.joinpath('documentation/translating.rst').read_text()
     doctree = core.publish_doctree(translating)
 
     for node in doctree.traverse(table):
         for row_node in node.traverse(row)[1:]:
             language = row_node[0].astext()
             repo = row_node[2].astext()
-            language_code = (
-                re.match(r'.* \((.*)\)', language).group(1).lower().replace('_', '-')
-            )
+            language_match = re.match(r'.* \((.*)\)', language)
+            if not language_match:
+                raise ValueError(
+                    f'Expected a language code in brackets in devguide table, found {language}'
+                )
+            language_code = language_match.group(1).lower().replace('_', '-')
             repo_match = re.match(':github:`GitHub <(.*)>`', repo)
             yield language_code, repo_match and repo_match.group(1)

translators.py

@@ -18,7 +18,7 @@ def get_number_from_git_history(path: Path) -> int:
 def yield_from_headers(path: Path) -> Generator[str, None, None]:
     for file in path.rglob('*.po'):
         try:
-            header = pofile(file).header.splitlines()
+            header = pofile(file).header.splitlines()  # type: ignore[call-overload]  # https://github.com/python/typeshed/pull/13396
         except IOError:
             continue
         if 'Translators:' not in header: