xenalib: flake8 fixes

The following flake8 ids are fixed by this commit.  This is in
preparation for a follow up commit which will add support for running
the xenalib under python3.

  E101, E111, E127, E128, E201, E202, E203, E211, E222, E251, E302, E303
  E305, E501, E703, F401, F821, F841, W191, W601

Signed-off-by: Nandan Kulkarni <nakulkar@redhat.com>
Signed-off-by: Aaron Conole <aconole@redhat.com>
Signed-off-by: Flavio Leitner <fbl@redhat.com>

Author: Nandan307

xenalib/BaseSocket.py

@@ -4,9 +4,10 @@
 
 logger = logging.getLogger(__name__)
 
+
 class BaseSocket:
 
-    def __init__(self, hostname, port = 5025, timeout = 5):
+    def __init__(self, hostname, port=5025, timeout=5):
         self.hostname = hostname
         self.port = port
         self.timeout = timeout
@@ -18,7 +19,7 @@ def __del__(self):
         self.disconnect()
 
     def is_connected(self):
-        return self.connected;
+        return self.connected
 
     def __connect(self):
         logger.debug("Connecting...")
@@ -29,16 +30,16 @@ def __connect(self):
             self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         except socket.error, msg:
             logger.error("Fail to create a socket: host %s:%d, error:%s",
-                          self.hostname, self.port, msg[0])
+                         self.hostname, self.port, msg[0])
             return False
 
         self.sock.settimeout(self.timeout)
 
         try:
-	       self.sock.connect((self.hostname, self.port))
+            self.sock.connect((self.hostname, self.port))
         except socket.error, msg:
             logger.error("Fail to connect to host %s:%d, error:%s",
-                          self.hostname, self.port, msg[0])
+                         self.hostname, self.port, msg[0])
             return False
 
         return True
@@ -110,7 +111,8 @@ def set_keepalives(self):
         self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
 
     def set_dummymode(self, enable=True):
-        logger.debug("Dummy mode was %s, request to %s", self.dummymode, enable)
+        logger.debug("Dummy mode was %s, request to %s", self.dummymode,
+                     enable)
         if self.dummymode is enable:
             return
 
@@ -126,7 +128,6 @@ def set_dummymode(self, enable=True):
             self.connect()
 
 
-
 def testsuite():
     hostname = "127.0.0.1"
     port = 22
@@ -135,7 +136,7 @@ def testsuite():
     dummy_test_result = False
     logging.basicConfig(level=logging.DEBUG)
     s = BaseSocket(hostname, port, 1)
-    print "Connecting to %s port %d" % ( hostname, port)
+    print "Connecting to %s port %d" % (hostname, port)
     s.connect()
     if s.is_connected():
         print "Internal Status: connected"
@@ -150,7 +151,7 @@ def testsuite():
 
     print "Setting dummy mode"
     s.set_dummymode(True)
-    print "Connecting to %s port %d" % ( hostname, port)
+    print "Connecting to %s port %d" % (hostname, port)
     s.connect()
     if s.is_connected():
         print "Connected, sending query"
@@ -177,6 +178,7 @@ def testsuite():
         print "Fail, please review the output"
         sys.exit(-1)
 
+
 if __name__ == '__main__':
     testsuite()
 

xenalib/KeepAliveThread.py

@@ -1,11 +1,12 @@
-import os
 import time
 import threading
 import logging
 
 logger = logging.getLogger(__name__)
+
+
 class KeepAliveThread(threading.Thread):
-    def __init__(self, basesocket, interval = 10):
+    def __init__(self, basesocket, interval=10):
         threading.Thread.__init__(self)
         self.message = ''
         self.nr_sent = 0
@@ -18,20 +19,19 @@ def __init__(self, basesocket, interval = 10):
     def get_nr_sent(self):
         return self.nr_sent
 
-    def stop (self):
+    def stop(self):
         logger.debug("Stopping")
         self.finished.set()
         self.join()
 
-    def run (self):
+    def run(self):
         while not self.finished.isSet():
             self.finished.wait(self.interval)
             logger.debug("Pinging")
             self.basesocket.sendQuery(self.message)
             self.nr_sent += 1
 
 
-
 def testsuite():
     import sys
     import BaseSocket
@@ -45,7 +45,7 @@ def testsuite():
     s = BaseSocket.BaseSocket(hostname, port, 1)
     print "Setting dummy mode"
     s.set_dummymode(True)
-    print "Connecting to %s port %d" % ( hostname, port)
+    print "Connecting to %s port %d" % (hostname, port)
     s.connect()
     if s.is_connected():
         print "Connected"

xenalib/StatsCSV.py

@@ -1,5 +1,6 @@
 import csv
 
+
 def _find_total_leaf_nodes(stats):
     leaf = 0
     if type(stats) is dict:
@@ -10,36 +11,40 @@ def _find_total_leaf_nodes(stats):
 
     return leaf
 
+
 def _find_total_nr_stats(stats):
     first_sample_key = stats.keys()[0]
     return _find_total_leaf_nodes(stats[first_sample_key])
 
+
 def _insert_centered_field(value, nr_leafs):
     line = [''] * nr_leafs
     line[nr_leafs / 2] = value
     return line
 
+
 def _build_unit_header_line(stats):
     header = ['timestamp']
     # first sample only
-    first_sample_key =  stats.keys()[0]
+    first_sample_key = stats.keys()[0]
     testnames = stats[first_sample_key].keys()
     for test in testnames:
         if type(stats[first_sample_key][test]) is dict:
             testunits = stats[first_sample_key][test].keys()
             if len(testunits):
                 header += testunits
                 continue
-        testunits = [ 'ND' ]
+        testunits = ['ND']
         header += testunits
     return header
 
+
 def _build_values_lines(stats):
     values = []
     sample_list = stats.keys()
     sample_list.sort()
     for sample in sample_list:
-        sample_values = [ sample ]
+        sample_values = [sample]
         testnames = stats[sample].keys()
         for test in testnames:
             if type(stats[sample][test]) is dict:
@@ -51,10 +56,11 @@ def _build_values_lines(stats):
         values.append(sample_values)
     return values
 
+
 def _build_test_header_line(stats, nr_columns):
     header = ['timestamp']
     # first sample only
-    first_sample_key =  stats.keys()[0]
+    first_sample_key = stats.keys()[0]
     testnames = stats[first_sample_key].keys()
     for test in testnames:
         nr_childs = _find_total_leaf_nodes(stats[first_sample_key][test])

xenalib/XenaManager.py

@@ -1,16 +1,15 @@
-import os
 import sys
 import time
 import logging
-import threading
 
 import KeepAliveThread
 import XenaPort
 
 logger = logging.getLogger(__name__)
 
+
 class XenaManager:
-    def __init__(self, xsocket, owner, password = 'xena'):
+    def __init__(self, xsocket, owner, password='xena'):
         self.xsocket = xsocket
         self.ports = {}
         if self.logon(password):
@@ -50,9 +49,8 @@ def set_owner(self, owner):
         command = self._compose_str_command('c_owner', owner[:8])
         return self.xsocket.sendQueryVerify(command)
 
-
     def add_port(self, module, port):
-        if self.ports.has_key((module, port)):
+        if (module, port) in self.ports:
             logger.error("Adding duplicated port")
             return
 
@@ -66,19 +64,19 @@ def add_port(self, module, port):
         return port_new
 
     def get_port(self, module, port):
-        if self.ports.has_key((module, port)):
+        if (module, port) in self.ports:
             return self.ports[(module, port)]
         return None
 
-    def remove_port(self, port):
-        if not self.ports.has_key((module, port)):
+    def remove_port(self, module, port):
+        if (module, port) not in self.ports:
             logger.error("Deleting unknown port")
             return
 
         port_del = self.ports.pop((module, port))
         port_del.reset()
         port_del.release()
-        del port_obj
+        del port_del
 
     def set_module_port(self, module_port):
         self.xsocket.sendCommand(module_port)

xenalib/XenaModifier.py

@@ -1,6 +1,8 @@
 import logging
 
 logger = logging.getLogger(__name__)
+
+
 class XenaModifier:
     def __init__(self, xsocket, port, stream, modifier_id):
         self.xsocket = xsocket