pylint: Fix some issues with F25 version

virt-manager

@@ -84,6 +84,7 @@ def _import_gtk(leftovers):
 
         globals()["Gtk"] = Gtk
         import virtManager.config
+        ignore = virtManager.config
     except Exception, e:
         # Don't just let the exception raise here. abrt reports bugs
         # when users mess up su/sudo and DISPLAY isn't set. Printing

virtManager/clone.py

@@ -24,15 +24,15 @@ import os
 from gi.repository import Gtk
 from gi.repository import Gdk
 
+import virtinst
+from virtinst import Cloner
+from virtinst import VirtualNetworkInterface
+
 from . import uiutil
 from .baseclass import vmmGObjectUI
 from .asyncjob import vmmAsyncJob
 from .storagebrowse import vmmStorageBrowser
 
-import virtinst
-from virtinst import Cloner
-from virtinst import VirtualNetworkInterface
-
 STORAGE_COMBO_CLONE = 0
 STORAGE_COMBO_SHARE = 1
 STORAGE_COMBO_SEP = 2

virtManager/createpool.py

@@ -24,12 +24,12 @@ from gi.repository import Gdk
 from gi.repository import GObject
 from gi.repository import Gtk
 
+from virtinst import StoragePool
+
 from .baseclass import vmmGObjectUI
 from .asyncjob import vmmAsyncJob
 from . import uiutil
 
-from virtinst import StoragePool
-
 PAGE_NAME   = 0
 PAGE_FORMAT = 1
 

virtManager/createvol.py

@@ -24,12 +24,12 @@ from gi.repository import GObject
 from gi.repository import Gtk
 from gi.repository import Gdk
 
+from virtinst import StorageVolume
+
 from . import uiutil
 from .baseclass import vmmGObjectUI
 from .asyncjob import vmmAsyncJob
 
-from virtinst import StorageVolume
-
 
 class vmmCreateVolume(vmmGObjectUI):
     __gsignals__ = {

virtManager/details.py

@@ -27,6 +27,10 @@ from gi.repository import Gdk
 
 import libvirt
 
+import virtinst
+from virtinst import util
+from virtinst import VirtualRNGDevice
+
 from . import vmmenu
 from . import uiutil
 from .baseclass import vmmGObjectUI
@@ -39,10 +43,6 @@ from .snapshots import vmmSnapshotPage
 from .storagebrowse import vmmStorageBrowser
 from .graphwidgets import Sparkline
 
-import virtinst
-from virtinst import util
-from virtinst import VirtualRNGDevice
-
 
 # Parameters that can be edited in the details window
 (EDIT_NAME,

virtManager/engine.py

@@ -364,7 +364,7 @@ class vmmEngine(vmmGObject):
         self._add_obj_to_tick_queue(conn, True, **kwargs)
 
     def tick(self):
-        for uri in self.conns.keys():
+        for uri in self.conns:
             conn = self.conns[uri]["conn"]
             self._add_obj_to_tick_queue(conn, False,
                                         stats_update=True, pollvm=True)
@@ -609,9 +609,8 @@ class vmmEngine(vmmGObject):
         handle_id = vmmGObject.connect(self, name, callback, *args)
 
         if name == "conn-added":
-            for uri in self.conns.keys():
-                self.emit("conn-added",
-                          self.conns[uri]["conn"])
+            for conn_dict in self.conns.values():
+                self.emit("conn-added", conn_dict["conn"])
 
         return handle_id
 

virtinst/__init__.py

@@ -36,7 +36,7 @@ def _setup_i18n():
 _setup_i18n()
 stable_defaults = _CLIConfig.stable_defaults
 
-from . import util
+from virtinst import util
 from virtinst import support
 from virtinst.uri import URI
 from virtinst.osdict import OSDB

virtinst/connection.py

@@ -21,6 +21,8 @@ import weakref
 
 import libvirt
 
+from virtcli import CLIConfig
+
 from . import pollhelpers
 from . import support
 from . import util
@@ -29,7 +31,6 @@ from .guest import Guest
 from .nodedev import NodeDevice
 from .storage import StoragePool, StorageVolume
 from .uri import URI, MagicURI
-from virtcli import CLIConfig
 
 
 class VirtualConnection(object):