typing: add missing annotations to silence mypy notes

Signed-off-by: Yann Dirson <[email protected]>

Author: ydirson

lib/host.py

@@ -209,9 +209,9 @@ def execute_script(self, script_contents, shebang='sh', simple_output=True):
             finally:
                 self.ssh(['rm', '-f', script.name])
 
-    def _get_xensource_inventory(self):
+    def _get_xensource_inventory(self) -> Dict[str, str]:
         output = self.ssh(['cat', '/etc/xensource-inventory'])
-        inventory: dict[str, str] = {}
+        inventory: Dict[str, str] = {}
         for line in output.splitlines():
             key, raw_value = line.split('=')
             inventory[key] = raw_value.strip('\'')

lib/vm.py

@@ -4,7 +4,7 @@
 import os
 import subprocess
 import tempfile
-from typing import Dict, List, Literal, Optional, overload, Union
+from typing import Dict, List, Literal, Optional, overload, TYPE_CHECKING, Union
 
 import lib.commands as commands
 import lib.efi as efi
@@ -14,8 +14,11 @@
 from lib.snapshot import Snapshot
 from lib.vif import VIF
 
+if TYPE_CHECKING:
+    from lib.host import Host
+
 class VM(BaseVM):
-    def __init__(self, uuid, host):
+    def __init__(self, uuid: str, host: 'Host'):
         super().__init__(uuid, host)
         self.ip: Optional[str] = None
         self.previous_host = None # previous host when migrated or being migrated
@@ -471,7 +474,7 @@ def clear_uefi_variables(self):
         """
         self.param_remove('NVRAM', 'EFI-variables')
 
-    def get_all_efi_bins(self):
+    def get_all_efi_bins(self) -> List[str]:
         magicsz = str(len(efi.EFI_HEADER_MAGIC))
         files = self.ssh(
             [
@@ -482,7 +485,7 @@ def get_all_efi_bins(self):
             decode=False).split(b'\n')
 
         magic = efi.EFI_HEADER_MAGIC.encode('ascii')
-        binaries: list[str] = []
+        binaries: List[str] = []
         for f in files:
             if magic in f:
                 # Avoid decoding an unsplit f, as some headers are not utf8