Fix type annotations

Author: arichardson

pycheribuild/mtree.py

@@ -38,7 +38,7 @@
 import typing
 from collections import OrderedDict
 from pathlib import Path, PurePath, PurePosixPath
-from typing import Optional, Union
+from typing import Iterator, Optional, Union
 
 from .utils import fatal_error, status_update, warning_message
 
@@ -117,7 +117,7 @@ def __repr__(self) -> str:
 
 class MtreeSubtree(collections.abc.MutableMapping):
     def __init__(self):
-        self.entry: MtreeEntry = None
+        self.entry: "Optional[MtreeEntry]" = None
         self.children: "dict[str, MtreeSubtree]" = OrderedDict()
 
     @staticmethod
@@ -172,7 +172,7 @@ def __len__(self):
             ret += len(c)
         return ret
 
-    def _glob(self, patfrags, prefix, *, case_sensitive=False):
+    def _glob(self, patfrags: "list[str]", prefix: MtreePath, *, case_sensitive=False) -> Iterator[MtreePath]:
         if len(patfrags) == 0:
             if self.entry is not None:
                 yield prefix
@@ -185,11 +185,12 @@ def _glob(self, patfrags, prefix, *, case_sensitive=False):
             return
         for k, v in self.children.items():
             if fnmatch.fnmatch(k, patfrag):
+                # noinspection PyProtectedMember
                 yield from v._glob(patfrags, prefix / k, case_sensitive=case_sensitive)
 
-    def glob(self, pattern, *, case_sensitive=False):
+    def glob(self, pattern: str, *, case_sensitive=False) -> Iterator[MtreePath]:
         if len(pattern) == 0:
-            return
+            raise StopIteration()  # pytype does not like plain "return"
         head, tail = os.path.split(pattern)
         patfrags = [tail]
         while head:
@@ -202,7 +203,7 @@ def _walk(self, top, prefix):
         if split is not None:
             return self.children[split[0]]._walk(split[1], prefix / split[0])
         if self.entry is not None and self.entry.attributes["type"] != "dir":
-            return
+            raise StopIteration()  # pytype does not like plain "return"
         files = []
         dirs = []
         for k, v in self.children.items():
@@ -268,7 +269,7 @@ def _ensure_mtree_mode_fmt(mode: "Union[str, int]") -> str:
         return mode
 
     @staticmethod
-    def _ensure_mtree_path_fmt(path: str) -> str:
+    def _ensure_mtree_path_fmt(path: str) -> MtreePath:
         # The path in mtree always starts with ./
         assert not path.endswith("/")
         assert path, "PATH WAS EMPTY?"
@@ -394,7 +395,7 @@ def add_dir(self, path, mode=None, uname="root", gname="wheel", print_status=Tru
             status_update("Adding dir", path, "to mtree as", entry, file=sys.stderr)
         self._mtree[mtree_path] = entry
 
-    def add_from_mtree(self, mtree_file, path, print_status=True):
+    def add_from_mtree(self, mtree_file: "MtreeFile", path: "Union[PurePath, str]", print_status=True):
         if isinstance(path, PurePath):
             path = str(path)
         assert not path.startswith("/")
@@ -471,7 +472,7 @@ def get(self, key):
     def root(self):
         return self._mtree
 
-    def glob(self, pattern, *, case_sensitive=False):
+    def glob(self, pattern: str, *, case_sensitive=False) -> Iterator[MtreePath]:
         return self._mtree.glob(pattern, case_sensitive=case_sensitive)
 
     def walk(self, top):

pycheribuild/projects/disk_image.py

@@ -33,10 +33,11 @@
 import shutil
 import sys
 import tempfile
+import typing
 from enum import Enum
 from functools import cached_property
-from pathlib import Path
-from typing import Optional
+from pathlib import Path, PurePath
+from typing import Optional, Union
 
 from .cross.cheribsd import BuildCHERIBSD, BuildFreeBSD, BuildFreeBSDWithDefaultOptions
 from .cross.gdb import BuildGDB, BuildKGDB
@@ -144,7 +145,7 @@ class BuildDiskImageBase(SimpleProject):
 
     @classproperty
     def default_architecture(self) -> CrossCompileTarget:
-        return self._source_class.default_architecture
+        return typing.cast(CrossCompileTarget, self._source_class.default_architecture)
 
     @classproperty
     def supported_architectures(self) -> "tuple[CrossCompileTarget, ...]":
@@ -241,6 +242,7 @@ def __init__(self, *args, **kwargs) -> None:
         self.hostname = os.path.expandvars(self.hostname)  # Expand env vars in hostname to allow $CHERI_BITS
         # MIPS needs big-endian disk images
         self.big_endian = self.compiling_for_mips(include_purecap=True)
+        self.stripped_contents: "dict[Union[str,Path], Path]" = {}
 
     @cached_property
     def source_project(self) -> BuildFreeBSD:
@@ -324,7 +326,13 @@ def create_file_for_image(
             self.write_file(target_file, contents, never_print_cmd=True, overwrite=False, mode=mode)
         self.add_file_to_image(target_file, base_directory=base_dir)
 
-    def add_from_mtree(self, mtree_file, mtree_path, strip_binaries: "Optional[bool]" = None, print_status=None):
+    def add_from_mtree(
+        self,
+        mtree_file: MtreeFile,
+        mtree_path: "Union[str, PurePath]",
+        strip_binaries: "Optional[bool]" = None,
+        print_status=None,
+    ):
         if strip_binaries is None:
             strip_binaries = self.strip_binaries
         kwargs = {}
@@ -1114,7 +1122,6 @@ def __init__(self, *args, **kwargs):
         self.file_templates = BuildMinimalCheriBSDDiskImage._MinimalFileTemplates()
         self.is_minimal = True
         self.ref_mtree = MtreeFile(verbose=self.config.verbose)
-        self.stripped_contents: "dict[str, Path]" = {}
 
     def setup(self):
         super().setup()
@@ -1229,7 +1236,7 @@ def add_unlisted_files_to_metalog(self):
                     extra_files.append(new_file)
                     # Stripping kernel modules makes them unloadable:
                     # kldload: /boot/kernel/smbfs.ko: file must have exactly one symbol table
-                    self.add_from_mtree(new_file, strip_binaries=False)
+                    self.add_from_mtree(self.ref_mtree, new_file, strip_binaries=False)
             self.verbose_print("Boot files:\n\t", "\n\t".join(map(str, sorted(extra_files))))
         self.verbose_print("Not adding unlisted files to METALOG since we are building a minimal image")