language and linting updates (#1015)

* language and linting updates

 - converted several format strings to f-strings
 - sorted and tidied imports (isort)
 - cleaned some whitespace
 - updated pylintrc to exclude examples
 - updated pylintrc to specify all currently failing cases, so any new ones could be part of pre-commit if so wished

* Update config.py

match pep8 for imports

* Update pylintrc

stylistic

Author: marksmayo

bandit/cli/config_generator.py

@@ -158,11 +158,11 @@ def main():
 
                 for skip in skips:
                     if not extension_loader.MANAGER.check_id(skip):
-                        raise RuntimeError("unknown ID in skips: %s" % skip)
+                        raise RuntimeError(f"unknown ID in skips: {skip}")
 
                 for test in tests:
                     if not extension_loader.MANAGER.check_id(test):
-                        raise RuntimeError("unknown ID in tests: %s" % test)
+                        raise RuntimeError(f"unknown ID in tests: {test}")
 
                 tpl = "# {0} : {1}"
                 test_list = [

bandit/cli/main.py

@@ -371,9 +371,8 @@ def main():
     parser.add_argument(
         "--version",
         action="version",
-        version="%(prog)s {version}\n  python version = {python}".format(
-            version=bandit.__version__, python=python_ver
-        ),
+        version=f"%(prog)s {bandit.__version__}\n"
+        f"  python version = {python_ver}",
     )
 
     parser.set_defaults(debug=False)
@@ -387,7 +386,7 @@ def main():
     blacklist_info = []
     for a in extension_mgr.blacklist.items():
         for b in a[1]:
-            blacklist_info.append("{}\t{}".format(b["id"], b["name"]))
+            blacklist_info.append(f"{b['id']}\t{b['name']}")
 
     plugin_list = "\n\t".join(sorted(set(plugin_info + blacklist_info)))
     dedent_text = textwrap.dedent(

bandit/core/config.py

@@ -19,7 +19,6 @@
 from bandit.core import extension_loader
 from bandit.core import utils
 
-
 LOG = logging.getLogger(__name__)
 
 

bandit/core/context.py

@@ -34,7 +34,7 @@ def __repr__(self):
 
         :return: A string representation of the object
         """
-        return "<Context %s>" % self._context
+        return f"<Context {self._context}>"
 
     @property
     def call_args(self):

bandit/core/docs_utils.py

@@ -16,11 +16,7 @@ def get_url(bid):
 
     info = extension_loader.MANAGER.plugins_by_id.get(bid)
     if info is not None:
-        return "{}plugins/{}_{}.html".format(
-            base_url,
-            bid.lower(),
-            info.plugin.__name__,
-        )
+        return f"{base_url}plugins/{bid.lower()}_{info.plugin.__name__}.html"
 
     info = extension_loader.MANAGER.blacklist_by_id.get(bid)
     if info is not None:

bandit/core/extension_loader.py

@@ -42,7 +42,7 @@ def test_has_id(plugin):
             if not hasattr(plugin.plugin, "_test_id"):
                 # logger not setup yet, so using print
                 print(
-                    "WARNING: Test '%s' has no ID, skipping." % plugin.name,
+                    f"WARNING: Test '{plugin.name}' has no ID, skipping.",
                     file=sys.stderr,
                 )
                 return False
@@ -82,16 +82,16 @@ def validate_profile(self, profile):
         """Validate that everything in the configured profiles looks good."""
         for inc in profile["include"]:
             if not self.check_id(inc):
-                raise ValueError("Unknown test found in profile: %s" % inc)
+                raise ValueError(f"Unknown test found in profile: {inc}")
 
         for exc in profile["exclude"]:
             if not self.check_id(exc):
-                raise ValueError("Unknown test found in profile: %s" % exc)
+                raise ValueError(f"Unknown test found in profile: {exc}")
 
         union = set(profile["include"]) & set(profile["exclude"])
         if len(union) > 0:
             raise ValueError(
-                "Non-exclusive include/exclude test sets: %s" % union
+                f"Non-exclusive include/exclude test sets: {union}"
             )
 
     def check_id(self, test):

bandit/core/manager.py

@@ -23,7 +23,6 @@
 from bandit.core import node_visitor as b_node_visitor
 from bandit.core import test_set as b_test_set
 
-
 LOG = logging.getLogger(__name__)
 NOSEC_COMMENT = re.compile(r"#\s*nosec:?\s*(?P<tests>[^#]+)?#?")
 NOSEC_COMMENT_TESTS = re.compile(r"(?:(B\d+|[a-z_]+),?)+", re.IGNORECASE)
@@ -195,8 +194,8 @@ def output_results(
 
         except Exception as e:
             raise RuntimeError(
-                "Unable to output report using '%s' formatter: "
-                "%s" % (output_format, str(e))
+                f"Unable to output report using "
+                f"'{output_format}' formatter: {str(e)}"
             )
 
     def discover_files(self, targets, recursive=False, excluded_paths=""):

bandit/core/meta_ast.py

@@ -5,7 +5,6 @@
 import collections
 import logging
 
-
 LOG = logging.getLogger(__name__)
 
 
@@ -40,7 +39,7 @@ def __str__(self):
         """
         tmpstr = ""
         for k, v in self.nodes.items():
-            tmpstr += "Node: %s\n" % k
-            tmpstr += "\t%s\n" % str(v)
-        tmpstr += "Length: %s\n" % len(self.nodes)
+            tmpstr += f"Node: {k}\n"
+            tmpstr += f"\t{str(v)}\n"
+        tmpstr += f"Length: {len(self.nodes)}\n"
         return tmpstr

bandit/core/node_visitor.py

@@ -10,7 +10,6 @@
 from bandit.core import tester as b_tester
 from bandit.core import utils as b_utils
 
-
 LOG = logging.getLogger(__name__)
 
 

bandit/core/test_set.py

@@ -8,7 +8,6 @@
 from bandit.core import blacklisting
 from bandit.core import extension_loader
 
-
 LOG = logging.getLogger(__name__)