Address lgtm.com errors

See https://lgtm.com/projects/g/distributed-system-analysis/pbench/alerts/?mode=list&severity=error

Author: portante

agent/bench-scripts/templates/make-fio-jobfile.py

@@ -38,6 +38,7 @@ def replace_all(dct, old, new):
         if isinstance(dct[k], dict):
             dct[k] = replace_all(dct[k], old, new)
         elif dct[k] is not None:
+            assert isinstance(dct[k], str)
             old_val = dct[k]
             del dct[k]
             k = k.replace(old, new)
@@ -51,9 +52,10 @@ def replace_val(dct, magic, delta):
     keys = list(dct.keys())
     for k in keys:
         if isinstance(dct[k], dict):
-            dct[k] = replace_val(dct[k], delta)
-        else:
-            if (dct[k] is not None) and magic in dct[k]:
+            dct[k] = replace_val(dct[k], magic, delta)
+        elif dct[k] is not None:
+            assert isinstance(dct[k], str)
+            if magic in dct[k]:
                 dct[k] = dct[k].replace(magic, delta[k])
 
 

contrib/agent/bench-scripts/pbench-bzt

@@ -58,7 +58,7 @@ class OSType:
         elif attr == "unknown":
             return "unknown"
         else:
-            raise (AttributeError, attr)
+            raise AttributeError(attr)
 
     def platform_type(self):
         if platform.dist()[0] == self.rhel:

lib/pbench/server/indexer.py

@@ -235,7 +235,7 @@ def __init__(self, basepath, idx_prefix, logger, known_tool_handlers=None, _dbg=
             toolname = m.group("toolname")
             if self.known_tool_handlers is not None:
                 if toolname not in self.known_tool_handlers:
-                    MappingFileError(
+                    raise MappingFileError(
                         "Unsupported tool '{}' mapping file {}".format(
                             toolname, mapping_fn
                         )