removed unnecessary calls to hash() in __hash__() methods as pointed out by @jkowalleck

Signed-off-by: Paul Horton <[email protected]>

Author: madpah

cyclonedx/model/__init__.py

@@ -775,7 +775,7 @@ def __eq__(self, other: object) -> bool:
         return False
 
     def __hash__(self) -> int:
-        return hash((hash(self.text), self.locale))
+        return hash((self.text, self.locale))
 
     def __repr__(self) -> str:
         return f'<Note id={id(self)}, locale={self.locale}>'
@@ -1080,7 +1080,7 @@ def __eq__(self, other: object) -> bool:
         return False
 
     def __hash__(self) -> int:
-        return hash((hash(self.timestamp), self.name, self.email))
+        return hash((self.timestamp, self.name, self.email))
 
     def __repr__(self) -> str:
         return f'<IdentifiableAction name={self.name}, email={self.email}>'

cyclonedx/model/bom.py

@@ -116,7 +116,7 @@ def __hash__(self) -> int:
         return hash((
             self.timestamp,
             tuple([hash(tool) for tool in set(sorted(self.tools, key=hash))]) if self.tools else None,
-            hash(self.component)
+            self.component
         ))
 
     def __repr__(self) -> str:
@@ -411,7 +411,7 @@ def __eq__(self, other: object) -> bool:
 
     def __hash__(self) -> int:
         return hash((
-            self.uuid, hash(self.metadata),
+            self.uuid, self.metadata,
             tuple([hash(c) for c in set(sorted(self.components, key=hash))]) if self.components else None,
             tuple([hash(s) for s in set(sorted(self.services, key=hash))]) if self.services else None
         ))

cyclonedx/model/component.py

@@ -133,7 +133,7 @@ def __eq__(self, other: object) -> bool:
         return False
 
     def __hash__(self) -> int:
-        return hash((self.uid, hash(self.url), hash(self.author), hash(self.committer), self.message))
+        return hash((self.uid, self.url, self.author, self.committer, self.message))
 
     def __repr__(self) -> str:
         return f'<Commit uid={self.uid}, url={self.url}, message={self.message}>'
@@ -283,7 +283,7 @@ def __eq__(self, other: object) -> bool:
         return False
 
     def __hash__(self) -> int:
-        return hash((hash(self.text), hash(self.url)))
+        return hash((self.text, self.url))
 
     def __repr__(self) -> str:
         return f'<Diff url={self.url}>'
@@ -379,7 +379,7 @@ def __eq__(self, other: object) -> bool:
 
     def __hash__(self) -> int:
         return hash((
-            hash(self.type), hash(self.diff),
+            self.type, self.diff,
             tuple([hash(issue) for issue in set(sorted(self.resolves, key=hash))]) if self.resolves else None
         ))
 
@@ -705,9 +705,7 @@ def __eq__(self, other: object) -> bool:
         return False
 
     def __hash__(self) -> int:
-        return hash((
-            self.tag_id, self.name, self.version, self.tag_version, self.patch, hash(self.text), hash(self.url)
-        ))
+        return hash((self.tag_id, self.name, self.version, self.tag_version, self.patch, self.text, self.url))
 
     def __repr__(self) -> str:
         return f'<Swid tagId={self.tag_id}, name={self.name}, version={self.version}>'

cyclonedx/model/service.py

@@ -337,8 +337,9 @@ def __hash__(self) -> int:
             tuple([hash(uri) for uri in set(sorted(self.endpoints, key=hash))]) if self.endpoints else None,
             tuple([hash(ref) for ref in
                    set(sorted(self.external_references, key=hash))]) if self.external_references else None,
-            self.group, str(self.licenses), self.name, self.properties, self.provider,
-            self.release_notes,
+            self.group,
+            tuple([hash(license_) for license_ in set(sorted(self.licenses, key=hash))]) if self.licenses else None,
+            self.name, self.properties, self.provider, self.release_notes,
             tuple([hash(service) for service in set(sorted(self.services, key=hash))]) if self.services else None,
             self.version, self.x_trust_boundary
         ))

cyclonedx/model/vulnerability.py

@@ -112,7 +112,7 @@ def __eq__(self, other: object) -> bool:
         return False
 
     def __hash__(self) -> int:
-        return hash((self.version, self.range, hash(self.status)))
+        return hash((self.version, self.range, self.status))
 
     def __repr__(self) -> str:
         return f'<BomTargetVersionRange version={self.version}, version_range={self.range}, status={self.status}>'
@@ -406,7 +406,7 @@ def __eq__(self, other: object) -> bool:
         return False
 
     def __hash__(self) -> int:
-        return hash((self.id, hash(self.source)))
+        return hash((self.id, self.source))
 
     def __repr__(self) -> str:
         return f'<VulnerabilityReference id={self.id}, source={self.source}>'
@@ -651,7 +651,7 @@ def __eq__(self, other: object) -> bool:
 
     def __hash__(self) -> int:
         return hash((
-            hash(self.source), self.score, self.severity, self.method, self.vector, self.justification
+            self.source, self.score, self.severity, self.method, self.vector, self.justification
         ))
 
     def __repr__(self) -> str:
@@ -1083,15 +1083,15 @@ def __eq__(self, other: object) -> bool:
 
     def __hash__(self) -> int:
         return hash((
-            self.id, hash(self.source),
+            self.id, self.source,
             tuple([hash(ref) for ref in set(sorted(self.references, key=hash))]) if self.references else None,
             tuple([hash(rating) for rating in set(sorted(self.ratings, key=hash))]) if self.ratings else None,
             tuple([hash(cwe) for cwe in set(sorted(self.cwes, key=hash))]) if self.cwes else None,
             self.description, self.detail, self.recommendation,
             tuple([hash(advisory) for advisory in set(sorted(self.advisories, key=hash))]) if self.advisories else None,
-            self.created, self.published, self.updated, hash(self.credits),
+            self.created, self.published, self.updated, self.credits,
             tuple([hash(tool) for tool in set(sorted(self.tools, key=hash))]) if self.tools else None,
-            hash(self.analysis),
+            self.analysis,
             tuple([hash(affected) for affected in set(sorted(self.affects, key=hash))]) if self.affects else None
         ))