Make pylint happy

.pylintrc

@@ -13,6 +13,7 @@ extension-pkg-whitelist=lxml.etree
 disable=
   bad-continuation,
   raising-format-tuple,
+  import-outside-toplevel,
   inconsistent-return-statements,
   duplicate-code,
   fixme,

qubesadmin/backup/restore.py

@@ -555,10 +555,8 @@ class ExtractWorker3(Process):
                         file_size = int(match.groups()[0])
                         size_func(file_size)
                         break
-                    else:
-                        self.log.warning(
-                            'unexpected tar output (no file size report): %s',
-                            line)
+                    self.log.warning(
+                        'unexpected tar output (no file size report): %s', line)
 
         return data_func(tar2_process.stdout)
 

qubesadmin/base.py

@@ -359,7 +359,7 @@ class WrapperObjectsCollection(object):
     def keys(self):
         '''Get list of names.'''
         self.refresh_cache()
-        return [key for key in self._names_list]
+        return list(self._names_list)
 
     def items(self):
         '''Get list of (key, value) pairs'''

qubesadmin/events/__init__.py

@@ -176,8 +176,7 @@ class EventsDispatcher(object):
                 except asyncio.IncompleteReadError as err:
                     if err.partial == b'':
                         break
-                    else:
-                        raise
+                    raise
 
                 if not subject:
                     subject = None

qubesadmin/tools/qvm_backup_restore.py

@@ -256,7 +256,7 @@ def main(args=None, app=None):
 
     if args.pass_file is None:
         if input("Do you want to proceed? [y/N] ").upper() != "Y":
-            exit(0)
+            sys.exit(0)
 
     try:
         backup.restore_do(restore_info)

qubesadmin/tools/qvm_ls.py

@@ -634,7 +634,8 @@ def main(args=None, app=None):
                    if set(dom.tags).intersection(set(args.tags))]
 
     pwrstates = {state: getattr(args, state) for state in DOMAIN_POWER_STATES}
-    domains = filter(lambda x: matches_power_states(x, **pwrstates), domains)
+    domains = [d for d in domains
+               if matches_power_states(d, **pwrstates)]
 
     table = Table(domains, columns, spinner, args.raw_data)
     table.write_table(sys.stdout)