misc. typing fixes

Author: anon

qubesadmin/app.py

@@ -148,8 +148,15 @@ def get_blind(self, item: str) -> QubesVM:
 
     T = TypeVar("T")
 
-    def get(self, item: str | QubesVM, default: QubesVM | T=None)\
-            -> QubesVM | T:
+    @typing.overload
+    def get(self, item: str | QubesVM) -> QubesVM:
+        ...
+    @typing.overload
+    def get(self, item: str | QubesVM, default: T) -> QubesVM | T:
+        ...
+    # Overloaded to handle default None return type
+    def get(self, item: str | QubesVM, default: object=None)\
+            -> object:
         """
         Get a VM object, or return *default* if it can't be found.
         """

qubesadmin/backup/core2.py

@@ -87,7 +87,7 @@ def rule_from_xml_v1(node: _Element, action: str) -> Rule:
 
         expire = node.get('expire')
 
-        kwargs = {
+        kwargs: dict[str, object] = {
             'action': action,
         }
         if dsthost:

qubesadmin/backup/restore.py

@@ -1438,7 +1438,7 @@ def _process_qubes_xml(self) -> Core2Qubes | Core3Qubes:
         queue.put(QUEUE_FINISHED)
 
         qubes_xml_path = os.path.join(self.tmpdir, 'qubes-restored.xml')
-        handlers = {
+        handlers: dict[str, Callable] = {
             'qubes.xml': functools.partial(self._save_qubes_xml, qubes_xml_path)
             }
         extract_proc = self._start_inner_extraction_worker(queue, handlers)

qubesadmin/device_protocol.py

@@ -513,7 +513,8 @@ def __lt__(self, other: object) -> bool:
                 other.port, AnyPort
             ):
                 return False
-            reprs = {self: [self.port], other: [other.port]}
+            reprs: dict[VirtualDevice | DeviceAssignment, list[Port | str]] \
+                = {self: [self.port], other: [other.port]}
             for obj, obj_repr in reprs.items():
                 if obj.device_id != "*":
                     obj_repr.append(obj.device_id)

qubesadmin/storage.py

@@ -111,8 +111,8 @@ def __lt__(self, other: object) -> bool:
             if self._vm and other._vm:
                 assert self._vm_name is not None and other._vm_name is not None
                 return (self._vm, self._vm_name) < (other._vm, other._vm_name)
-            if self._vid and other._vid:
-                assert self._pool is not None and other._pool is not None
+            if self._pool and other._pool:
+                assert self._vid is not None and other._vid is not None
                 return (self._pool, self._vid) < (other._pool, other._vid)
         return NotImplemented
 
@@ -279,8 +279,6 @@ def revert(self, revision: str) -> None:
 
         :param str revision: Revision identifier to revert to
         """
-        if not isinstance(revision, str):
-            raise TypeError('revision must be a str')
         self._qubesd_call('Revert', revision.encode('ascii'))
 
     def import_data(self, stream: BinaryIO) -> None:
@@ -332,7 +330,7 @@ class Pool:
     """ A Pool is used to manage different kind of volumes (File
         based/LVM/Btrfs/...).
     """
-    def __init__(self, app: QubesBase, name: str | None=None):
+    def __init__(self, app: QubesBase, name: str):
         """ Initialize storage pool wrapper
 
         :param app: Qubes() object
@@ -343,7 +341,6 @@ def __init__(self, app: QubesBase, name: str | None=None):
         self._config = None
 
     def __str__(self) -> str:
-        assert self.name is not None
         return self.name
 
     def __eq__(self, other: object) -> bool: