Clean up some misc pylint

Author: crobinso

tests/xmlconfig-xml/boot-usb2.xml

@@ -0,0 +1,35 @@
+<domain type='xen'>
+  <name>TestGuest</name>
+  <uuid>12345678-1234-1234-1234-123456789012</uuid>
+  <memory>409600</memory>
+  <currentMemory>204800</currentMemory>
+  <vcpu>5</vcpu>
+  <os>
+    <type arch='i686'>hvm</type>
+    <loader>/usr/lib/xen/boot/hvmloader</loader>
+    <boot dev='network'/>
+  </os>
+  <features>
+    <acpi/><apic/>
+  </features>
+  <clock offset="utc"/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
+  <devices>
+    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+    <controller type='usb' index='0' model='ich9-ehci1'/>
+    <controller type='usb' index='0' model='ich9-uhci1'>
+      <master startport='0'/>
+    </controller>
+    <controller type='usb' index='0' model='ich9-uhci2'>
+      <master startport='2'/>
+    </controller>
+    <controller type='usb' index='0' model='ich9-uhci3'>
+      <master startport='4'/>
+    </controller>
+    <input type='mouse' bus='ps2'/>
+    <graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
+    <console type='pty'/>
+  </devices>
+</domain>

tests/xmlconfig.py

@@ -848,6 +848,13 @@ def testCpuset(self):
         cpu = virtinst.CPU(g.conn)
         self.assertEquals(cpu.vcpus_from_topology(), 1)
 
+    def testUsb2(self):
+        i = utils.make_pxe_installer()
+        g = utils.get_basic_fullyvirt_guest(installer=i)
+
+        g.add_usb_ich9_controllers()
+
+        self._compare(g, "boot-usb2", False)
 
     #
     # Full Install tests: try to mimic virt-install as much as possible

virt-convert

@@ -213,7 +213,7 @@ def main():
         clean += [ options.output_dir ]
     except OSError, e:
         if (e.errno != errno.EEXIST):
-            fail("Could not create directory %s: %s", 
+            fail("Could not create directory %s: %s",
                 (options.output_dir, e.strerror))
 
     if not options.output_file:

virtinst/DistroInstaller.py

@@ -231,7 +231,7 @@ def set_location(self, val):
                                 conn=self.conn,
                                 volName=stuple)
                 val = d.path
-            except Exception, e:
+            except:
                 _util.log_exception("Error validating install location")
                 raise ValueError(_("Checking installer location failed: "
                                    "Could not find media '%s'." % str(val)))

virtinst/Guest.py

@@ -40,6 +40,7 @@
 from VirtualDisk import VirtualDisk
 from VirtualInputDevice import VirtualInputDevice
 from VirtualCharDevice import VirtualCharDevice
+from VirtualController import VirtualControllerUSB
 from Clock import Clock
 from Seclabel import Seclabel
 from CPU import CPU

virtinst/User.py

@@ -55,13 +55,13 @@ def has_priv(self, priv, conn=None):
             return (self._euid == 0) or _util.is_qemu_system(conn)
 
         if platform.system() == 'SunOS':
-            return self._sun_has_priv(priv, conn)
+            return self._sun_has_priv(priv)
 
         # For all others, just assume that prescence of a connection
         # means we are privileged enough
         return True
 
-    def _sun_has_priv(self, priv, conn=None):
+    def _sun_has_priv(self, priv):
         # Not easy to work out!
         if self._euid != User.current().euid:
             return self._euid == 0

virtinst/VirtualFilesystem.py

@@ -141,13 +141,13 @@ def _get_target(self):
     def _set_target(self, val):
         is_qemu = self.is_qemu()
 
-        # In case of qemu for default fs type (mount) target is not 
+        # In case of qemu for default fs type (mount) target is not
         # actually a directory, it is merely a arbitrary string tag
         # that is exported to the guest as a hint for where to mount
         if (is_qemu and
             (self.type == self.TYPE_DEFAULT or
              self.type == self.TYPE_MOUNT)):
-             pass
+            pass
         elif not os.path.isabs(val):
             raise ValueError(_("Filesystem target '%s' must be an absolute "
                                "path") % val)

virtinst/VirtualHostDevice.py

@@ -20,9 +20,7 @@
 import VirtualDevice
 import NodeDeviceParser
 import logging
-import libvirt
 
-from virtinst import support
 from virtinst import _gettext as _
 from XMLBuilderDomain import _xml_property
 
@@ -179,12 +177,12 @@ def _get_source_xml(self):
 
     def setup(self, conn=None):
         """
-        Perform DeviceDetach and DeviceReset calls if necessary
+        Unused
 
         @param conn: libvirt virConnect instance to use (defaults to devices
                      connection)
         """
-        raise NotImplementedError
+        ignore = conn
 
     def _get_xml_config(self):
         xml  = ("    <hostdev mode='%s' type='%s' managed='%s'>\n" % \