@@ -109,8 +109,7 @@ def find_subid(self, subven, subdev):
except:
if (subven == "ffff" and subdev == "ffff"):
return SubDevice("ffff", "ffff", "(All Subdevices)")
- else:
- return SubDevice(subven, subdev, "(Unknown Subdevice)")
+ return SubDevice(subven, subdev, "(Unknown Subdevice)")
class SubDevice:
@@ -253,8 +252,7 @@ def _section_from_spec(self, spec):
num = int(spec)
if num < self.elffile.num_sections():
return self.elffile.get_section(num)
- else:
- return None
+ return None
except ValueError:
# Not a number. Must be a name then
section = self.elffile.get_section_by_name(force_unicode(spec))
@@ -300,7 +298,7 @@ def parse_pmd_info_string(self, mystring):
except KeyError:
continue
- if (len(pmdinfo["pci_ids"]) != 0):
+ if len(pmdinfo["pci_ids"]) != 0:
print("PMD HW SUPPORT:")
if pcidb is not None:
self.pretty_print_pmdinfo(pmdinfo)
@@ -325,7 +323,7 @@ def display_pmd_info_strings(self, section_spec):
while dataptr < len(data):
while (dataptr < len(data) and
- not (32 <= byte2int(data[dataptr]) <= 127)):
+ not 32 <= byte2int(data[dataptr]) <= 127):
dataptr += 1
if dataptr >= len(data):
@@ -338,7 +336,7 @@ def display_pmd_info_strings(self, section_spec):
# pyelftools may return byte-strings, force decode them
mystring = force_unicode(data[dataptr:endptr])
rc = mystring.find("PMD_INFO_STRING")
- if (rc != -1):
+ if rc != -1:
self.parse_pmd_info_string(mystring)
dataptr = endptr
@@ -391,7 +389,7 @@ def search_for_autoload_path(self):
while dataptr < len(data):
while (dataptr < len(data) and
- not (32 <= byte2int(data[dataptr]) <= 127)):
+ not 32 <= byte2int(data[dataptr]) <= 127):
dataptr += 1
if dataptr >= len(data):
@@ -404,7 +402,7 @@ def search_for_autoload_path(self):
# pyelftools may return byte-strings, force decode them
mystring = force_unicode(data[dataptr:endptr])
rc = mystring.find("DPDK_PLUGIN_PATH")
- if (rc != -1):
+ if rc != -1:
rc = mystring.find("=")
return (mystring[rc + 1:], library)
@@ -512,7 +510,7 @@ def scan_for_autoload_pmds(dpdk_path):
"""
global raw_output
- if (os.path.isfile(dpdk_path) is False):
+ if os.path.isfile(dpdk_path) is False:
if raw_output is False:
print("Must specify a file name")
return
@@ -527,16 +525,16 @@ def scan_for_autoload_pmds(dpdk_path):
(autoload_path, scannedfile) = readelf.search_for_autoload_path()
if not autoload_path:
- if (raw_output is False):
+ if raw_output is False:
print("No autoload path configured in %s" % dpdk_path)
return
- if (raw_output is False):
- if (scannedfile is None):
+ if raw_output is False:
+ if scannedfile is None:
scannedfile = dpdk_path
print("Found autoload path %s in %s" % (autoload_path, scannedfile))
file.close()
- if (raw_output is False):
+ if raw_output is False:
print("Discovered Autoload HW Support:")
scan_autoload_path(autoload_path)
return
@@ -591,7 +589,7 @@ def main(stream=None):
options.pcifile = None
pcidb = None
- if (len(args) == 0):
+ if len(args) == 0:
optparser.print_usage()
exit(1)
@@ -599,16 +597,16 @@ def main(stream=None):
exit(scan_for_autoload_pmds(args[0]))
ldlibpath = os.environ.get('LD_LIBRARY_PATH')
- if (ldlibpath is None):
+ if ldlibpath is None:
ldlibpath = ""
- if (os.path.exists(args[0]) is True):
+ if os.path.exists(args[0]) is True:
myelffile = args[0]
else:
myelffile = search_file(
args[0], ldlibpath + ":/usr/lib64:/lib64:/usr/lib:/lib")
- if (myelffile is None):
+ if myelffile is None:
print("File not found")
sys.exit(1)
Python lint complains: usertools/dpdk-pmdinfo.py:303:0: C0325: Unnecessary parens after 'if' keyword (superfluous-parens) usertools/dpdk-pmdinfo.py:328:0: C0325: Unnecessary parens after 'not' keyword (superfluous-parens) usertools/dpdk-pmdinfo.py:341:0: C0325: Unnecessary parens after 'if' keyword (superfluous-parens) usertools/dpdk-pmdinfo.py:394:0: C0325: Unnecessary parens after 'not' keyword (superfluous-parens) usertools/dpdk-pmdinfo.py:407:0: C0325: Unnecessary parens after 'if' keyword (superfluous-parens) usertools/dpdk-pmdinfo.py:515:0: C0325: Unnecessary parens after 'if' keyword (superfluous-parens) usertools/dpdk-pmdinfo.py:530:0: C0325: Unnecessary parens after 'if' keyword (superfluous-parens) usertools/dpdk-pmdinfo.py:533:0: C0325: Unnecessary parens after 'if' keyword (superfluous-parens) usertools/dpdk-pmdinfo.py:534:0: C0325: Unnecessary parens after 'if' keyword (superfluous-parens) usertools/dpdk-pmdinfo.py:539:0: C0325: Unnecessary parens after 'if' keyword (superfluous-parens) usertools/dpdk-pmdinfo.py:594:0: C0325: Unnecessary parens after 'if' keyword (superfluous-parens) usertools/dpdk-pmdinfo.py:602:0: C0325: Unnecessary parens after 'if' keyword (superfluous-parens) usertools/dpdk-pmdinfo.py:605:0: C0325: Unnecessary parens after 'if' keyword (superfluous-parens) usertools/dpdk-pmdinfo.py:611:0: C0325: Unnecessary parens after 'if' keyword (superfluous-parens) usertools/dpdk-pmdinfo.py:110:12: R1705: Unnecessary "else" after "return" (no-else-return) usertools/dpdk-pmdinfo.py:254:12: R1705: Unnecessary "else" after "return" (no-else-return) Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> --- usertools/dpdk-pmdinfo.py | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-)