Cleanup dynamic types

Author: anon

qubesadmin/app.py

@@ -34,7 +34,7 @@
 import typing
 from logging import Logger
 from subprocess import Popen
-from typing import IO
+from typing import IO, TypeVar, Literal
 from collections.abc import Generator, Iterable
 
 import qubesadmin.base
@@ -56,7 +56,9 @@
 except ImportError:
     has_qubesdb = False
 
-DeviceClass = typing.LiteralString
+# ["mic", "block", "pci", "usb", "webcam"]
+# but can be extended
+DeviceClass = str
 
 
 class VMCollection:
@@ -222,9 +224,7 @@ def list_vmclass(self) -> list[Klass]:
         vmclass = (
             self.qubesd_call("dom0", "admin.vmclass.List").decode().splitlines()
         )
-        for e in vmclass:
-            assert e in typing.get_args(Klass)
-        return typing.cast(list[Klass], sorted(vmclass))
+        return sorted(vmclass)
 
     def list_deviceclass(self) -> list[DeviceClass]:
         """Call Qubesd in order to obtain the device classes list"""
@@ -233,10 +233,8 @@ def list_deviceclass(self) -> list[DeviceClass]:
             .decode()
             .splitlines()
         )
-        for e in deviceclasses:
-            assert e in typing.get_args(DeviceClass)
 
-        return typing.cast(list[DeviceClass], sorted(deviceclasses))
+        return sorted(deviceclasses)
 
     def _refresh_pool_drivers(self) -> None:
         """

qubesadmin/vm/__init__.py

@@ -27,7 +27,7 @@
 import typing
 import warnings
 from logging import Logger
-from typing import Literal
+from typing import Literal, TypeVar
 
 import qubesadmin.exc
 import qubesadmin.storage
@@ -39,7 +39,10 @@
 if typing.TYPE_CHECKING:
     import qubesadmin.base
 
-Klass = Literal["AppVM", "AdminVM", "TemplateVM", "DispVM", "StandaloneVM"]
+
+# ["AppVM", "AdminVM", "TemplateVM", "DispVM", "StandaloneVM"]
+# but can be extended
+Klass = str
 PowerState = Literal["Transient", "Running", "Halted", "Paused",
 "Suspended", "Halting", "Dying", "Crashed", "NA"]