Pylint fixes

Signed-off-by: Ganesh Maharaj Mahalingam <[email protected]>

Author: Ganesh Maharaj Mahalingam

hwinfo/host/dmidecode.py

@@ -19,5 +19,3 @@ class DmidecodeParser(CommandParser):
         # Processor Info
         r'Processor\ Information\n\tSocket\ Designation:\ (?P<socket_designation>.*)\n',
     ]
-
-

hwinfo/pci/__init__.py

@@ -10,17 +10,14 @@ def __init__(self, record):
     def lookup_value(self, k):
         if k in self.rec:
             return self.rec[k]
-        else:
-            return None
+        return None
 
     def _fmt(self, value, wrap=None):
         if not value:
             return self.NONE_VALUE
-        else:
-            if wrap:
-                return "%s%s%s" % (wrap, value, wrap)
-            else:
-                return value
+        if wrap:
+            return "%s%s%s" % (wrap, value, wrap)
+        return value
 
     def get_device_name(self):
         wrap = None
@@ -35,8 +32,7 @@ def get_device_name(self):
             # If the input has come from lspci, this is the value for
             # not being able to find a key in the pciids db.
             return '[Device %s]' % self.get_device_id()
-        else:
-            return self._fmt(name, wrap)
+        return self._fmt(name, wrap)
 
 
     def get_device_id(self):
@@ -64,8 +60,7 @@ def get_subdevice_name(self):
             # If the input has come from lspci, this is the value for
             # not being able to find a key in the pciids db.
             return '[Device %s]' % self.get_subdevice_id()
-        else:
-            return self._fmt(name, wrap)
+        return self._fmt(name, wrap)
 
     def get_subdevice_id(self):
         return self._fmt(self.lookup_value('pci_subdevice_id'))
@@ -88,14 +83,13 @@ def get_pci_class(self):
         return self._fmt(self.lookup_value('pci_device_class'))
 
     def is_subdevice(self):
-        return self.lookup_value('pci_subvendor_id') and self.lookup_value('pci_subdevice_id') or self.lookup_value('pci_device_sub_string')
+        return self.lookup_value('pci_subdevice_id') if self.lookup_value('pci_subvendor_id') else self.lookup_value('pci_device_sub_string')
 
     def get_info(self):
 
         if self.is_subdevice():
             return "%s %s (%s %s)" % (self.get_subvendor_name(), self.get_subdevice_name(), self.get_vendor_name(), self.get_device_name())
-        else:
-            return "%s %s" % (self.get_vendor_name(), self.get_device_name())
+        return "%s %s" % (self.get_vendor_name(), self.get_device_name())
 
     def get_rec(self):
         rec = {}

hwinfo/pci/biosdevname.py

@@ -13,5 +13,3 @@ class BiosdevnameDParser(CommandParser):
         r'Driver\ version:\ (?P<driver_version>.*)\n',
         r'Firmware\ version:\ (?P<firmware_version>.*)\n',
     ]
-
-

hwinfo/tools/inspector.py

@@ -1,14 +1,15 @@
 #!/usr/bin/env python
 
+from __future__ import print_function
 from argparse import ArgumentParser
-import paramiko
 import subprocess
 import os
 import sys
 import tarfile
 import tempfile
 import shutil
 import json
+import paramiko
 
 from prettytable import PrettyTable
 
@@ -121,8 +122,7 @@ def is_remote(self):
     def exec_command(self, cmd):
         if self.is_remote():
             return remote_command(self.client, cmd)
-        else:
-            return local_command(cmd)
+        return local_command(cmd)
 
     def get_lspci_data(self):
         return self.exec_command(['lspci', '-nnmm'])
@@ -273,9 +273,8 @@ def _load_from_file(self, filename):
         """Find filename in tar, and load it"""
         if filename in self.fdata:
             return self.fdata[filename]
-        else:
-            filepath = find_in_tarball(self.tarloc, filename)
-            return read_from_tarball(self.tarloc, filepath)
+        filepath = find_in_tarball(self.tarloc, filename)
+        return read_from_tarball(self.tarloc, filepath)
 
 def pci_filter(devices, types):
     res = []

hwinfo/util/__init__.py

@@ -58,12 +58,11 @@ def parse_item(self, item):
     def parse_items(self):
         if not self.ITEM_SEPERATOR:
             return [self.parse_item(self.DATA)]
-        else:
-            recs = []
-            for data in str(self.DATA).split(self.ITEM_SEPERATOR):
-                rec = self.parse_item(data)
-                recs.append(rec)
-            return recs
+        recs = []
+        for data in str(self.DATA).split(self.ITEM_SEPERATOR):
+            rec = self.parse_item(data)
+            recs.append(rec)
+        return recs
 
     def parse(self):
         if self.ITEM_SEPERATOR: