pylint: deal with too-many-positional-arguments

First of all, raise default warning level - many event handlers have
standard 6 or 7 arguments.
Then, adjust other cases, converting to keyword-only arguments for
readability (they were used this way already anyway).

This also revealed few places where DeviceAssignment was used
incorrectly.

.pylintrc

@@ -191,6 +191,8 @@ min-public-methods=2
 # Maximum number of public methods for a class (see R0904).
 max-public-methods=100
 
+max-positional-arguments=7
+
 
 [EXCEPTIONS]
 

qubes/__init__.py

@@ -189,7 +189,7 @@ class property:  # pylint: disable=redefined-builtin,invalid-name
     # internal use only
     _NO_DEFAULT = object()
 
-    def __init__(self, name, setter=None, saver=None, type=None,
+    def __init__(self, name, setter=None, saver=None, type=None, *,
             default=_NO_DEFAULT, write_once=False, load_stage=2, order=0,
             save_via_ref=False, clone=True,
             doc=None):

qubes/api/admin.py

@@ -1336,7 +1336,7 @@ async def vm_device_unassign(self, endpoint):
         self.fire_event_for_permission(device=dev, devclass=devclass)
 
         assignment = qubes.device_protocol.DeviceAssignment(
-            dev.backend_domain, dev.ident, devclass)
+            dev.backend_domain, dev.ident, devclass=devclass)
         await self.dest.devices[devclass].unassign(assignment)
         self.app.save()
 
@@ -1390,7 +1390,7 @@ async def vm_device_detach(self, endpoint):
         self.fire_event_for_permission(device=dev, devclass=devclass)
 
         assignment = qubes.device_protocol.DeviceAssignment(
-            dev.backend_domain, dev.ident, devclass)
+            dev.backend_domain, dev.ident, devclass=devclass)
         await self.dest.devices[devclass].detach(assignment)
 
     # Assign/Unassign action can modify only a persistent state of running VM.

qubes/backup.py

@@ -88,6 +88,7 @@ class BackupHeader:
     int_options = ['version']
 
     def __init__(self,
+            *,
             version=None,
             encrypted=None,
             compressed=None,

qubes/device_protocol.py

@@ -29,6 +29,8 @@
 The same in `qubes-core-admin` and `qubes-core-admin-client`,
 should be moved to one place.
 """
+
+
 import string
 import sys
 from enum import Enum
@@ -433,6 +435,7 @@ def __init__(
             self,
             backend_domain: QubesVM,
             ident: str,
+            *,
             devclass: Optional[str] = None,
             vendor: Optional[str] = None,
             product: Optional[str] = None,
@@ -790,7 +793,7 @@ class DeviceAssignment(Device):
                                and required to start domain.
     """
 
-    def __init__(self, backend_domain, ident, options=None,
+    def __init__(self, backend_domain, ident, *, options=None,
                  frontend_domain=None, devclass=None,
                  required=False, attach_automatically=False):
         super().__init__(backend_domain, ident, devclass)

qubes/dochelpers.py

@@ -89,7 +89,7 @@ def ticket(name, rawtext, text, lineno, inliner, options=None, content=None):
         that called this function
     :param options: Directive options for customisation
     :param content: The directive content for customisation
-    """  # pylint: disable=unused-argument
+    """  # pylint: disable=unused-argument,too-many-positional-arguments
 
     if options is None:
         options = {}

qubes/storage/__init__.py

@@ -82,7 +82,7 @@ class Volume:
     #: for sparse volumes
     usage = 0
 
-    def __init__(self, name, pool, vid,
+    def __init__(self, name, pool, vid, *,
             revisions_to_keep=0, rw=False, save_on_stop=False, size=0,
             snap_on_start=False, source=None, ephemeral=None, **kwargs):
         ''' Initialize a volume.

qubes/storage/zfs.py

@@ -1803,6 +1803,7 @@ def __init__(
         name: str,
         pool: ZFSPool,
         vid: Vid,
+        *,
         revisions_to_keep: int = 1,
         rw: bool = False,
         save_on_stop: bool = False,

qubes/tests/api_admin.py

@@ -1790,7 +1790,7 @@ def test_471_vm_device_list_assigned_options(self):
     def device_list_single_attached_testclass(self, vm, event, **kwargs):
         if vm is not self.vm:
             return
-        dev = qubes.device_protocol.DeviceInfo(self.vm, '1234', 'testclass')
+        dev = qubes.device_protocol.DeviceInfo(self.vm, '1234', devclass='testclass')
         yield (dev, {'attach_opt': 'value'})
 
     def test_472_vm_device_list_attached(self):
@@ -1823,9 +1823,9 @@ def test_473_vm_device_list_assigned_specific(self):
     def device_list_multiple_attached_testclass(self, vm, event, **kwargs):
         if vm is not self.vm:
             return
-        dev = qubes.device_protocol.DeviceInfo(self.vm, '1234', 'testclass')
+        dev = qubes.device_protocol.DeviceInfo(self.vm, '1234', devclass='testclass')
         yield (dev, {'attach_opt': 'value'})
-        dev = qubes.device_protocol.DeviceInfo(self.vm, '4321', 'testclass')
+        dev = qubes.device_protocol.DeviceInfo(self.vm, '4321', devclass='testclass')
         yield (dev, {'attach_opt': 'value'})
 
     def test_474_vm_device_list_attached_specific(self):

qubes/tests/devices.py

@@ -48,7 +48,7 @@ def __init__(self, app, name, *args, **kwargs):
         super(TestVM, self).__init__(*args, **kwargs)
         self.app = app
         self.name = name
-        self.device = TestDevice(self, 'testdev', 'testclass')
+        self.device = TestDevice(self, 'testdev', devclass='testclass')
         self.events_enabled = True
         self.devices = {
             'testclass': qubes.devices.DeviceCollection(self, 'testclass')

qubes/tests/vm/qubesvm.py

@@ -1482,7 +1482,7 @@ def test_600_libvirt_xml_hvm_cdrom_boot(self):
         self.app.vmm.offline_mode = False
         dev = qubes.device_protocol.DeviceAssignment(
             dom0, 'sda',
-            {'devtype': 'cdrom', 'read-only': 'yes'},
+            options={'devtype': 'cdrom', 'read-only': 'yes'},
             attach_automatically=True, required=True)
         self.loop.run_until_complete(vm.devices['block'].assign(dev))
         libvirt_xml = vm.create_config_file()
@@ -1587,7 +1587,7 @@ def test_600_libvirt_xml_hvm_cdrom_dom0_kernel_boot(self):
             self.app.vmm.offline_mode = False
             dev = qubes.device_protocol.DeviceAssignment(
                 dom0, 'sda',
-                {'devtype': 'cdrom', 'read-only': 'yes'},
+                options={'devtype': 'cdrom', 'read-only': 'yes'},
                  attach_automatically=True, required=True)
             self.loop.run_until_complete(vm.devices['block'].assign(dev))
             libvirt_xml = vm.create_config_file()

qubes/tools/__init__.py

@@ -74,6 +74,7 @@ class SinglePropertyAction(argparse.Action):
     '''Action for argument parser that stores a property.'''
 
     # pylint: disable=redefined-builtin,too-few-public-methods
+    # pylint: disable=too-many-positional-arguments
     def __init__(self,
             option_strings,
             dest,

qubes/vm/__init__.py

@@ -287,7 +287,7 @@ def load_extras(self):
                     device_assignment = qubes.device_protocol.DeviceAssignment(
                         self.app.domains[node.get('backend-domain')],
                         node.get('id'),
-                        options,
+                        options=options,
                         attach_automatically=True,
                         # backward compatibility: persistent~>required=True
                         required=qubes.property.bool(

qubes/vm/qubesvm.py

@@ -1516,8 +1516,9 @@ async def unpause(self):
 
         return self
 
-    async def run_service(self, service, source=None, user=None, stubdom=False,
-                    filter_esc=False, autostart=False, gui=False, **kwargs):
+    async def run_service(self, service, source=None, user=None, *,
+            stubdom=False,
+            filter_esc=False, autostart=False, gui=False, **kwargs):
         """Run service on this VM
 
         :param str service: service name