diff --git a/src/hostinfo-libvirt.py b/src/hostinfo-libvirt.py
index 968abcb13c65b384f0e49c8d09f4f931c3129699..d1b883720cc4cfeb0a79a933cdfc4c0e6a5fd807 100644
--- a/src/hostinfo-libvirt.py
+++ b/src/hostinfo-libvirt.py
@@ -17,7 +17,7 @@ if __name__ == '__main__':
                       help='hostinfo file')
     args.add_argument('--host',
                       default=os.uname()[1].split('.')[0],
-                      action='store', 
+                      action='store',
                       metavar='HOST',
                       help='The hypervisor HOST to generate information for')
     args.add_argument('--wait-for-prefix',
@@ -25,35 +25,35 @@ if __name__ == '__main__':
                       metavar='PREFIX',
                       help='Wait for PREFIX before continuing')
     args.add_argument('--prefix',
-                      action='store', 
+                      action='store',
                       metavar='PREFIX',
                       help='Network PREFIX to use for ip address mapping')
     args.add_argument('--export',
                       default=False,
-                      action='store_true', 
+                      action='store_true',
                       help='Check/CREATE disk images and setup IP aliases')
     args.add_argument('--mount',
                       default=None,
-                      action='store', 
+                      action='store',
                       metavar='HOST',
                       help='Check and mount disks for HOST')
     args.add_argument('--un-mount',
                       default=None,
-                      action='store', 
+                      action='store',
                       metavar='HOST',
                       help='Check and un-mount disks for HOST')
     args.add_argument('--mount-hard',
                       default=None,
-                      action='store', 
+                      action='store',
                       metavar='HOST',
                       help='Check and hard-mount disks for HOST')
     args.add_argument('--mount-all',
                       default=False,
-                      action='store_true', 
+                      action='store_true',
                       help='Check and mount all hosts')
     args.add_argument('--check-vm-all',
                       default=False,
-                      action='store_true', 
+                      action='store_true',
                       help='Check all VMs (possibly CREATE them)')
     args.add_argument('--check-vm',
                       nargs='+',
@@ -82,14 +82,14 @@ if __name__ == '__main__':
                       help='Ignore VMs on HYPERVISOR')
     args.add_argument('--create',
                       default=False,
-                      action='store_true', 
+                      action='store_true',
                       help='CREATE missing resources')
     args.add_argument('--attach',
                       default=False,
-                      action='store_true', 
+                      action='store_true',
                       help='ATTACH missing resources to running VMs')
     args.add_argument('--vm-xml',
-                      action='store', 
+                      action='store',
                       metavar='HOST',
                       help='Generate XML suitable for "virsh define" of HOST')
     args.add_argument('--virtualize-physical',
@@ -144,7 +144,7 @@ if __name__ == '__main__':
     for attr in [ 'check_vm', 'check_hypervisor',
                   'ignore_vm', 'ignore_hypervisor', 'check_netgroup']:
         o = getattr(options, attr)
-        if o != None:
+        if o is not None:
             setattr(options, attr, set(o))
         pass
 
@@ -187,5 +187,3 @@ if __name__ == '__main__':
     if options.vm_xml:
         vm.print_xml(db)
         pass
-
-