Merge branch 'propery-type'

* propery-type:
  tests: type preservation on stateless property
  Add type annotations to some stateless properties
  Preserve stateless property based on type annotation

Author: marmarek

qubes/__init__.py

@@ -505,11 +505,13 @@ def bool(self, prop, value):
 def stateless_property(func):
     """Decorator similar to :py:class:`builtins.property`, but for properties
     exposed through management API (including qvm-prefs etc)"""
+    prop_type = func.__annotations__.get('return', None)
     return property(
         func.__name__,
         setter=property.forbidden,
         saver=property.dontsave,
         default=func,
+        type=prop_type,
         doc=func.__doc__,
     )
 

qubes/tests/api_admin.py

@@ -261,6 +261,11 @@ def test_021_vm_property_get_int(self):
             b"admin.vm.property.Get", b"test-vm1", b"vcpus"
         )
         self.assertEqual(value, "default=True type=int 2")
+        # check also if type is preserved on stateless property
+        value = self.call_mgmt_func(
+            b"admin.vm.property.Get", b"test-vm1", b"xid"
+        )
+        self.assertEqual(value, "default=True type=int -1")
 
     def test_022_vm_property_get_bool(self):
         value = self.call_mgmt_func(

qubes/vm/qubesvm.py

@@ -950,7 +950,7 @@ def __str__(self):
     # VMM-related
 
     @qubes.stateless_property
-    def xid(self):
+    def xid(self) -> int:
         """Xen ID.
 
         Or not Xen, but ID.
@@ -970,7 +970,7 @@ def xid(self):
             raise
 
     @qubes.stateless_property
-    def stubdom_uuid(self):
+    def stubdom_uuid(self) -> str:
         stubdom_xid = self.stubdom_xid
         if stubdom_xid == -1:
             return ""
@@ -981,7 +981,7 @@ def stubdom_uuid(self):
         return stubdom_uuid[4:].decode("ascii", "strict")
 
     @qubes.stateless_property
-    def stubdom_xid(self):
+    def stubdom_xid(self) -> int:
         if not self.is_running():
             return -1
 
@@ -2653,7 +2653,7 @@ def start_time(self):
         return None
 
     @qubes.stateless_property
-    def icon(self):
+    def icon(self) -> str:
         """freedesktop icon name, suitable for use in
         :py:meth:`PyQt4.QtGui.QIcon.fromTheme`"""
         raw_icon_name = self.label.name