freewvs.git

@@ -14,7 +14,7 @@ class TestCodingstyle(unittest.TestCase):

         pylint_disable = "missing-docstring,invalid-name,duplicate-code," \

                          + "too-many-arguments,consider-using-with"

-        subprocess.run(["pylint", "--disable=%s" % pylint_disable]

+        subprocess.run(["pylint", f"--disable={pylint_disable}"]

                        + pyfiles, check=True)

         subprocess.run(["flake8", "--select=DUO"] + pyfiles, check=True)

@@ -27,8 +27,9 @@ class TestFreewvsData(unittest.TestCase):

         for tdir in glob.glob(tmp + "/testdata/webapps/*"):

             bdir = os.path.basename(tdir)

             for tarball in glob.glob(tdir + "/dist/*"):

-                shutil.unpack_archive(tarball, "%s/%s/%s-src"

-                                      % (tmp, bdir, os.path.basename(tarball)))

+                tname = os.path.basename(tarball)

+                shutil.unpack_archive(tarball,

+                                      f"{tmp}/{bdir}/{tname}-src")

             fwrun = subprocess.run(["./freewvs", "-a", tmp + "/" + bdir],

                                    stdout=subprocess.PIPE, check=True)

             fwdata = re.sub(tmp, "[dir]", fwrun.stdout.decode("utf-8"))

@@ -42,7 +43,7 @@ class TestFreewvsData(unittest.TestCase):

             if refclean != fwclean:

                 print("\n".join(difflib.ndiff(refclean, fwclean)))

             self.assertEqual(refclean, fwclean,

-                             msg="Output in %s does not match" % bdir)

+                             msg=f"Output in {bdir} does not match")

         # misc tests, for read errors, garbage data etc.

         subprocess.run(["./freewvs", "-a", tmp + "/testdata/misc/"],

@@ -25,7 +25,7 @@ class TestJsonLint(unittest.TestCase):

             tmp = json.loads(orig)

             new = json.dumps(tmp, indent=2)

             if orig != new:

-                print("json %s not valid" % f)

+                print(f"json {f} not valid")

                 sys.stdout.writelines(difflib.unified_diff(orig, new))

                 valid = False

         self.assertTrue(valid)

@@ -41,17 +41,16 @@ class TestJsonLint(unittest.TestCase):

             # check for all mandatory keys

             self.assertEqual(mkeys.intersection(item.keys()), mkeys,

-                             msg="Missing key in %s" % item['name'])

+                             msg=f"Missing key in {item['name']}")

             # check we have at least one detection

             self.assertTrue(len(item['detection']) >= 1,

-                            msg="No detection in %s" % item['name'])

+                            msg=f"No detection in {item['name']}")

             # vuln needs to be CVE or HTTPS URL

             self.assertTrue(re.match("^CVE-[0-9]*-[0-9]*$", item['vuln'])

                             or item['vuln'].startswith("https://"),

-                            msg="%s: Invalid vuln %s" %

-                            (item['name'], item['vuln']))

+                            msg=f"{item['name']}: Invalid vuln {item['vuln']}")

             # make sure old_safe is properly sorted

             if 'old_safe' in item:

@@ -59,20 +58,21 @@ class TestJsonLint(unittest.TestCase):

                 for i in range(1, len(old_safe)):

                     self.assertTrue(versioncompare(old_safe[i - 1],

                                                    old_safe[i]),

-                                    msg="%s: Invalid old_safe ordering %s" %

-                                    (item['name'], item['old_safe']))

+                                    msg=f"{item['name']}: Invalid old_safe"

+                                        " ordering {item['old_safe']}")

             # make sure latest is not outdated

             if 'latest' in item and item['safe'] != "":

                 self.assertTrue(not versioncompare(item['safe'],

                                                    item['latest']),

-                                msg="%s: Safe version %s newer than latest %s"

-                                % (item['name'], item['safe'], item['latest']))

+                                msg=f"{item['name']}: Safe version "

+                                    "{item['safe']} newer than latest"

+                                    " {item['latest']}")

             # subdir needs to be integer

             for det in item['detection']:

                 self.assertTrue(isinstance(det['subdir'], int),

-                                msg="%s: subdir not int" % item['name'])

+                                msg=f"{item['name']}: subdir not int")

 if __name__ == '__main__':