refactor: Code formatting

Author: anthonyharrison

sbomdiff/cli.py

@@ -14,6 +14,7 @@
 
 # CLI processing
 
+
 def main(argv=None):
 
     argv = argv or sys.argv
@@ -74,10 +75,10 @@ def main(argv=None):
     # Check both files exist
     file_found = True
     if not pathlib.Path(args["FILE1"]).exists():
-        print (f"{args['FILE1']} does not exist")
+        print(f"{args['FILE1']} does not exist")
         file_found = False
     if not pathlib.Path(args["FILE2"]).exists():
-        print (f"{args['FILE2']} does not exist")
+        print(f"{args['FILE2']} does not exist")
         file_found = False
     if not file_found:
         return -1
@@ -131,10 +132,16 @@ def main(argv=None):
             version1, license1 = packages1[package]
             version2, license2 = packages2[package]
             if version1 != version2:
-                sbom_out.send_output(f"[VERSION] {package}: Version changed from {version1} to {version2}")
+                sbom_out.send_output(
+                    f"[VERSION] {package}: "
+                    f"Version changed from {version1} to {version2}"
+                )
                 version_changes += 1
             if not args["exclude_license"] and license1 != license2:
-                sbom_out.send_output(f"[LICENSE] {package}: License changed from {license1} to {license2}")
+                sbom_out.send_output(
+                    f"[LICENSE] {package}: "
+                    f"License changed from {license1} to {license2}"
+                )
                 license_changes += 1
         else:
             # Package must have been removed
@@ -162,5 +169,6 @@ def main(argv=None):
 
     return 0
 
+
 if __name__ == "__main__":
     sys.exit(main())

sbomdiff/cyclonedx_parser.py

@@ -20,7 +20,7 @@ def parse(self, sbom_file):
             return {}
 
     def parse_cyclonedx_json(self, sbom_file):
-        """parses CycloneDX JSON BOM file extracting package name, version and license"""
+        """parses CycloneDX JSON SBOM extracting package name, version and license"""
         data = json.load(open(sbom_file))
         packages = {}
         # Check that valid CycloneDX JSON file is being processed
@@ -57,7 +57,11 @@ def parse_cyclonedx_xml(self, sbom_file):
             try:
                 for component in components.findall(schema + "component"):
                     # Only for application and library components
-                    if component.attrib["type"] in ["library", "application", "operating-system"]:
+                    if component.attrib["type"] in [
+                        "library",
+                        "application",
+                        "operating-system",
+                    ]:
                         component_name = component.find(schema + "name")
                         if component_name is None:
                             raise KeyError(f"Could not find package in {component}")
@@ -77,7 +81,7 @@ def parse_cyclonedx_xml(self, sbom_file):
                         if version is not None:
                             if package not in packages:
                                 packages[package] = [version, license]
-            except KeyError as e:
+            except KeyError:
                 pass
 
         return packages

sbomdiff/output.py

@@ -34,7 +34,7 @@ def show(self, message):
 
 
 class SBOMOutput:
-    """Output manager """
+    """Output manager"""
 
     def __init__(self, filename="console"):
         self.filename = filename

sbomdiff/spdx_parser.py

@@ -28,7 +28,7 @@ def parse(self, sbom_file):
             return {}
 
     def parse_spdx_tag(self, sbom_file):
-        """parses SPDX tag value BOM file extracting package name, version and license"""
+        """parses SPDX tag value file extracting package name, version and license"""
         with open(sbom_file) as f:
             lines = f.readlines()
         packages = {}
@@ -64,7 +64,7 @@ def parse_spdx_json(self, sbom_file):
                     license = d["licenseConcluded"]
                     if package not in packages:
                         packages[package] = [version, license]
-                except KeyError as e:
+                except KeyError:
                     pass
 
         return packages
@@ -75,6 +75,7 @@ def parse_spdx_rdf(self, sbom_file):
             lines = f.readlines()
         packages = {}
         package = ""
+        license = None
         for line in lines:
             try:
                 if line.strip().startswith("<spdx:name>"):
@@ -108,19 +109,21 @@ def parse_spdx_rdf(self, sbom_file):
                         license = "NOT FOUND"
                     else:
                         license = license_match.group(1)
-                        if license.startswith("\"http://spdx.org/licenses/"):
+                        if license.startswith('"http://spdx.org/licenses/'):
                             # SPDX license identifier. Extract last part of url
                             license = license.split("/")[-1]
-                            license=license[:-1] # Remove trialing "
+                            license = license[:-1]  # Remove trialing "
                         if "#" in license:
-                            # Extract last part of url after # e.g. http://spdx.org/rdf/terms#noassertion
+                            # Extract last part of url after #
+                            # e.g. http://spdx.org/rdf/terms#noassertion
                             license = license.split("#")[-1]
-                            license=license[:-1].upper() # Remove trialing " and capitalise
+                            # Remove trialing " and capitalise
+                            license = license[:-1].upper()
                     # To handle case where license appears before version
                     if package not in packages and version is not None:
                         packages[package] = [version, license]
                         license = None
-            except KeyError as e:
+            except KeyError:
                 pass
 
         return packages
@@ -139,7 +142,7 @@ def parse_spdx_yaml(self, sbom_file):
                     license = d["licenseConcluded"]
                     if package not in packages:
                         packages[package] = [version, license]
-                except KeyError as e:
+                except KeyError:
                     pass
 
         return packages
@@ -178,7 +181,7 @@ def parse_spdx_xml(self, sbom_file):
                     if package not in packages:
                         packages[package] = [version, license]
 
-            except KeyError as e:
+            except KeyError:
                 pass
 
         return packages