Merge pull request #22 from truenas/flake8-fixes

various minor flake8/bug fixes

Author: aravindavk

gluster/cli/parsers.py

@@ -63,8 +63,7 @@ def parse_volume_info(info):
 
 
 def _parse_a_node(node_el):
-    brick_path = (node_el.find('hostname').text + ":" +
-                  node_el.find('path').text)
+    brick_path = (node_el.find('hostname').text + ":" + node_el.find('path').text)
     value = {
         'name': brick_path,
         'uuid': node_el.find('peerid').text,
@@ -78,20 +77,19 @@ def _parse_a_node(node_el):
         'fs_name': node_el.find('fsName').text,
     }
 
-    # ISSUE #14 glusterfs 3.6.5 does not have 'ports' key 
+    # ISSUE #14 glusterfs 3.6.5 does not have 'ports' key
     # in vol status detail xml output
     if node_el.find('ports'):
         value['ports'] = {
             "tcp": node_el.find('ports').find("tcp").text,
             "rdma": node_el.find('ports').find("rdma").text
         }
     else:
-        value['ports'] = { 
-            "tcp": node_el.find('port') ,
+        value['ports'] = {
+            "tcp": node_el.find('port'),
             "rdma": None
         }
 
-
     return value
 
 
@@ -441,13 +439,15 @@ def parse_tier_detach(data):
 def parse_tier_status(data):
     raise NotImplementedError("Tier Status")
 
+
 def parse_volume_list(data):
     xml = etree.fromstring(data)
     volumes = []
     for el in xml.findall('volList/volume'):
         volumes.append(el.text)
     return volumes
 
+
 def parse_heal_info(data):
     xml = etree.fromstring(data)
     healinfo = []
@@ -461,7 +461,6 @@ def parse_heal_info(data):
     return healinfo
 
 
-
 def parse_heal_statistics(data):
     raise NotImplementedError("Heal Statistics")
 
@@ -478,9 +477,10 @@ def parse_snapshot_list(data):
     xml = etree.fromstring(data)
     snapshots = []
     for el in xml.findall('snapList/snapshot'):
-      snapshots.append(el.text)
+        snapshots.append(el.text)
     return snapshots
 
+
 def _parse_a_peer(peer):
     value = {
         'uuid': peer.find('uuid').text,

gluster/cli/peer.py

@@ -47,6 +47,7 @@ def detach(host):
     cmd = ["detach", host]
     return peer_execute(cmd)
 
+
 def detach_all():
     """
     Removes All Hosts from Cluster
@@ -61,19 +62,20 @@ def detach_all():
         for peer in peers:
             host = peer["hostname"]
             if peer["connected"] == "Connected":
-                cmd = ["detach",host]
+                cmd = ["detach", host]
                 try:
                     result = peer_execute(cmd)
-                    out = str(host)+" "+result
+                    out = str(host) + " " + result.decode()
                     outlist.append(out)
                 except Exception as err:
                     errors_list.append(err)
             else:
-                err = str(host)+" is not connected"
+                err = str(host) + " is not connected"
                 errors_list.append(err)
     if len(errors_list):
         raise GlusterCmdException((1, "", errors_list))
-    return "/n".join(outlist)
+    return "\n".join(outlist)
+
 
 def status():
     """

gluster/metrics/diskstats.py

@@ -115,5 +115,4 @@ def local_diskstats(volname=None):
 
         brick.update(diskstat_data.get(brick["device"], default_diskstat))
 
-
     return local_bricks

gluster/metrics/utilization.py

@@ -9,7 +9,7 @@ def local_utilization(volname=None):
 
     :param volname: Volume Name
     :returns: List of utilization information
-        {               
+        {
             "volume": VOLUME_NAME,
             "brick_index": BRICK_INDEX_IN_VOL_INFO,
             "node_id": NODE_ID,