Fix pylint with latest pylint version

Signed-off-by: Cole Robinson <crobinso@redhat.com>

pylintrc

@@ -3,7 +3,7 @@
 # can either give multiple identifier separated by comma (,) or put this option
 # multiple time (only on the command line, not in the configuration file where
 # it should appear only once).
-disable=Design,Similarities,invalid-name,missing-docstring,line-too-long,too-many-lines,superfluous-parens,bad-whitespace,locally-disabled,no-self-use,unnecessary-lambda,star-args,fixme,global-statement,bare-except,anomalous-backslash-in-string,broad-except,cyclic-import,bad-continuation,locally-enabled,unidiomatic-typecheck,redefined-variable-type,bad-option-value,wrong-import-position,consider-using-ternary,no-else-return,len-as-condition,inconsistent-return-statements,useless-object-inheritance,consider-using-in,useless-return,assignment-from-none,chained-comparison
+disable=Design,Similarities,invalid-name,missing-docstring,line-too-long,too-many-lines,superfluous-parens,bad-whitespace,locally-disabled,no-self-use,unnecessary-lambda,star-args,fixme,global-statement,bare-except,anomalous-backslash-in-string,broad-except,cyclic-import,bad-continuation,locally-enabled,unidiomatic-typecheck,redefined-variable-type,bad-option-value,wrong-import-position,consider-using-ternary,no-else-return,len-as-condition,inconsistent-return-statements,useless-object-inheritance,consider-using-in,useless-return,assignment-from-none,chained-comparison,import-outside-toplevel
 enable=fixme
 
 

virtManager/addhardware.py

@@ -926,7 +926,7 @@ class vmmAddHardware(vmmGObjectUI):
                 mod_list.append("tpm-spapr")
             else:
                 mod_list.append("tpm-tis")
-                if tpmversion == None or tpmversion != '1.2':
+                if tpmversion != '1.2':
                     mod_list.append("tpm-crb")
             mod_list.sort()
         return mod_list

virtManager/object/storagepool.py

@@ -273,7 +273,7 @@ class vmmStoragePool(vmmLibvirtObject):
         keymap = dict((o.get_connkey(), o) for o in self._volumes or [])
         def cb(obj, key):
             return vmmStorageVolume(self.conn, obj, key)
-        (ignore, ignore, allvols) = pollhelpers.fetch_volumes(
+        (dummy1, dummy2, allvols) = pollhelpers.fetch_volumes(
             self.conn.get_backend(), self.get_backend(), keymap, cb)
         self._volumes = allvols
 

virtinst/connection.py

@@ -183,7 +183,7 @@ class VirtinstConnection(object):
         return self._fetch_cache[key][:]
 
     def _fetch_all_domains_raw(self):
-        ignore, ignore, ret = pollhelpers.fetch_vms(
+        dummy1, dummy2, ret = pollhelpers.fetch_vms(
             self, {}, lambda obj, ignore: obj)
         return [Guest(weakref.proxy(self), parsexml=obj.XMLDesc(0))
                 for obj in ret]
@@ -193,12 +193,12 @@ class VirtinstConnection(object):
                            parsexml=poolobj.XMLDesc(0))
 
     def _fetch_all_pools_raw(self):
-        ignore, ignore, ret = pollhelpers.fetch_pools(
+        dummy1, dummy2, ret = pollhelpers.fetch_pools(
             self, {}, lambda obj, ignore: obj)
         return [self._build_pool_raw(poolobj) for poolobj in ret]
 
     def _fetch_all_nodedevs_raw(self):
-        ignore, ignore, ret = pollhelpers.fetch_nodedevs(
+        dummy1, dummy2, ret = pollhelpers.fetch_nodedevs(
             self, {}, lambda obj, ignore: obj)
         return [NodeDevice(weakref.proxy(self), obj.XMLDesc(0))
                 for obj in ret]
@@ -209,7 +209,7 @@ class VirtinstConnection(object):
         if pool.info()[0] != libvirt.VIR_STORAGE_POOL_RUNNING:
             return ret
 
-        ignore, ignore, vols = pollhelpers.fetch_volumes(
+        dummy1, dummy2, vols = pollhelpers.fetch_volumes(
             self, pool, {}, lambda obj, ignore: obj)
 
         for vol in vols:

virtinst/storage.py

@@ -439,7 +439,7 @@ def _progress_thread(volname, pool, meter, event):
         return
 
     while True:  # pragma: no cover
-        ignore, ignore, alloc = vol.info()
+        dummy1, dummy2, alloc = vol.info()
         meter.update(alloc)
         if event.wait(1):
             break

virtinst/virtinstall.py

@@ -567,7 +567,7 @@ def build_guest_instance(conn, options):
         osdata.set_installdata_name(installdata.os)
 
     if options.reinstall:
-        dummy, guest, dummy = cli.get_domain_and_guest(conn, options.reinstall)
+        dummy1, guest, dummy2 = cli.get_domain_and_guest(conn, options.reinstall)
     else:
         guest = _build_options_guest(conn, options)