Misc small fixes after pylint checking

Change-Id: I85c7d98b0b717163ddefea35a2a022ce7c9c1973
diff --git a/admin.py b/admin.py
index 341c1c3..577a84b 100644
--- a/admin.py
+++ b/admin.py
@@ -392,7 +392,7 @@
         else:
             print 'No switch found for name %s' % opts.lookup_switch_by_name
     except InputError as inst:
-        print 'Failed: %s' % inst    
+        print 'Failed: %s' % inst
 elif opts.show_switch is not None:
     try:
         this_switch = call_vland('db_query',
@@ -404,7 +404,7 @@
         else:
             print 'No switch found for switch_id %d' % opts.show_switch
     except InputError as inst:
-        print 'Failed: %s' % inst    
+        print 'Failed: %s' % inst
 elif opts.list_switch_ports is not None:
     try:
         ports = call_vland('db_query',
@@ -417,7 +417,7 @@
         else:
             print 'No ports found for switch_id %d' % opts.list_switch_ports
     except InputError as inst:
-        print 'Failed: %s' % inst    
+        print 'Failed: %s' % inst
 elif opts.show_port is not None:
     try:
         this_port = call_vland('db_query',
@@ -429,7 +429,7 @@
         else:
             print 'No port found for port_id %d' % opts.show_port
     except InputError as inst:
-        print 'Failed: %s' % inst    
+        print 'Failed: %s' % inst
 elif opts.lookup_port_by_switch_and_name is not None:
     try:
         p = call_vland('db_query',
@@ -442,7 +442,7 @@
         else:
             print 'No port found for switch_id %d, name %s' % (int(opts.lookup_port_by_switch_and_name[0]), opts.lookup_port_by_switch_and_name[1])
     except InputError as inst:
-        print 'Failed: %s' % inst    
+        print 'Failed: %s' % inst
 elif opts.set_port_mode is not None:
     try:
         port_id = call_vland('vlan_update',
@@ -452,7 +452,7 @@
                                'mode': opts.set_port_mode[1]}})
         print "Updated mode for port_id %d" % port_id
     except InputError as inst:
-        print 'Failed: %s' % inst    
+        print 'Failed: %s' % inst
 elif opts.lock_port is not None:
     try:
         port_id = call_vland('db_update',
@@ -462,7 +462,7 @@
                                'is_locked': True}})
         print "Locked port_id %d" % port_id
     except InputError as inst:
-        print 'Failed: %s' % inst    
+        print 'Failed: %s' % inst
 elif opts.unlock_port is not None:
     try:
         port_id = call_vland('db_update',
@@ -472,7 +472,7 @@
                                'is_locked': False}})
         print "Unlocked port_id %d" % port_id
     except InputError as inst:
-        print 'Failed: %s' % inst    
+        print 'Failed: %s' % inst
 elif opts.set_port_current_vlan is not None:
     try:
         port_id = call_vland('vlan_update',