diff --git a/qubes/app.py b/qubes/app.py index 642736b0..f2e086c9 100644 --- a/qubes/app.py +++ b/qubes/app.py @@ -723,8 +723,8 @@ class Qubes(qubes.PropertyHolder): default_netvm = qubes.VMProperty('default_netvm', load_stage=3, default=None, allow_none=True, setter=_setter_default_netvm, - doc="""Default NetVM for AppVMs. Initial - state is `None`, which means that AppVMs + doc="""Default NetVM for AppVMs. Initial + state is `None`, which means that AppVMs are not connected to the Internet.""") default_template = qubes.VMProperty('default_template', load_stage=3, vmclass=qubes.vm.templatevm.TemplateVM, @@ -732,7 +732,7 @@ class Qubes(qubes.PropertyHolder): allow_none=True) updatevm = qubes.VMProperty('updatevm', load_stage=3, default=None, allow_none=True, - doc="""Which VM to use as `yum` proxy for + doc="""Which VM to use as `yum` proxy for updating AdminVM and TemplateVMs""") clockvm = qubes.VMProperty('clockvm', load_stage=3, default=None, allow_none=True, @@ -787,15 +787,15 @@ class Qubes(qubes.PropertyHolder): load_stage=3, default=60, type=int, - doc="""Default time in seconds - after which qrexec connection + doc="""Default time in seconds + after which qrexec connection attempt is deemed failed""") default_shutdown_timeout = qubes.property('default_shutdown_timeout', load_stage=3, default=60, type=int, - doc="""Default time in seconds + doc="""Default time in seconds for VM shutdown to complete""") stats_interval = qubes.property('stats_interval', diff --git a/qubes/ext/gui.py b/qubes/ext/gui.py index 03e63af7..a677adb3 100644 --- a/qubes/ext/gui.py +++ b/qubes/ext/gui.py @@ -36,6 +36,8 @@ class GUI(qubes.ext.Extension): @qubes.ext.handler('property-set:guivm') def on_property_set(self, subject, event, name, newvalue, oldvalue=None): + # pylint: disable=unused-argument,no-self-use + # Clean other 'guivm-XXX' tags. # gui-daemon can connect to only one domain tags_list = list(subject.tags) diff --git a/qubes/vm/qubesvm.py b/qubes/vm/qubesvm.py index 90eb63d8..03958d5b 100644 --- a/qubes/vm/qubesvm.py +++ b/qubes/vm/qubesvm.py @@ -2041,8 +2041,8 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM): return 0 # this does not work, because libvirt - # return self.libvirt_domain.getCPUStats( - # libvirt.VIR_NODE_CPU_STATS_ALL_CPUS, 0)[0]['cpu_time']/10**9 + # return self.libvirt_domain.getCPUStats( + # libvirt.VIR_NODE_CPU_STATS_ALL_CPUS, 0)[0]['cpu_time']/10**9 return self.libvirt_domain.info()[4]