todo

Signed-off-by: Jan Kowalleck <[email protected]>

Author: jkowalleck

cyclonedx/model/__init__.py

@@ -148,6 +148,7 @@ def __lt__(self, other: object) -> bool:
         return NotImplemented
 
     def __hash__(self) -> int:
+        # TODO
         return hash((self.flow, self.classification))
 
     def __repr__(self) -> str:
@@ -251,6 +252,7 @@ def __lt__(self, other: Any) -> bool:
         return NotImplemented
 
     def __hash__(self) -> int:
+        # TODO
         return hash((self.content, self.content_type, self.encoding))
 
     def __repr__(self) -> str:
@@ -530,6 +532,7 @@ def __lt__(self, other: Any) -> bool:
         return NotImplemented
 
     def __hash__(self) -> int:
+        # TODO
         return hash((self.alg, self.content))
 
     def __repr__(self) -> str:
@@ -733,7 +736,7 @@ def __init__(self, uri: str) -> None:
 
     def __eq__(self, other: Any) -> bool:
         if isinstance(other, XsUri):
-            return hash(other) == hash(self)
+            return self._uri == other._uri
         return False
 
     def __lt__(self, other: Any) -> bool:
@@ -907,6 +910,7 @@ def __lt__(self, other: Any) -> bool:
         return NotImplemented
 
     def __hash__(self) -> int:
+        # TODO
         return hash((
             self._type, self._url, self._comment,
             tuple(sorted(self._hashes, key=hash))
@@ -984,6 +988,7 @@ def __lt__(self, other: Any) -> bool:
         return NotImplemented
 
     def __hash__(self) -> int:
+        # TODO
         return hash((self.name, self.value))
 
     def __repr__(self) -> str:
@@ -1075,6 +1080,7 @@ def __lt__(self, other: Any) -> bool:
         return NotImplemented
 
     def __hash__(self) -> int:
+        # TODO
         return hash((self.content, self.content_type, self.encoding))
 
     def __repr__(self) -> str:
@@ -1159,6 +1165,7 @@ def __lt__(self, other: Any) -> bool:
         return NotImplemented
 
     def __hash__(self) -> int:
+        # TODO
         return hash((self.text, self.locale))
 
     def __repr__(self) -> str:
@@ -1249,6 +1256,7 @@ def __lt__(self, other: Any) -> bool:
         return NotImplemented
 
     def __hash__(self) -> int:
+        # TODO
         return hash((self.timestamp, self.name, self.email))
 
     def __repr__(self) -> str:
@@ -1287,16 +1295,16 @@ def text(self, text: str) -> None:
 
     def __eq__(self, other: object) -> bool:
         if isinstance(other, Copyright):
-            return hash(other) == hash(self)
+            return self._text == other._text
         return False
 
     def __lt__(self, other: Any) -> bool:
         if isinstance(other, Copyright):
-            return self.text < other.text
+            return self._text < other._text
         return NotImplemented
 
     def __hash__(self) -> int:
-        return hash(self.text)
+        return hash(self._text)
 
     def __repr__(self) -> str:
         return f'<Copyright text={self.text}>'

cyclonedx/model/component.py

@@ -763,6 +763,7 @@ def __eq__(self, other: object) -> bool:
         return False
 
     def __hash__(self) -> int:
+        # TODO
         return hash((
             tuple(self.ancestors), tuple(self.descendants), tuple(self.variants), tuple(self.commits),
             tuple(self.patches), self.notes
@@ -908,6 +909,7 @@ def __eq__(self, other: object) -> bool:
         return False
 
     def __hash__(self) -> int:
+        # TODO
         return hash((self.tag_id, self.name, self.version, self.tag_version, self.patch, self.text, self.url))
 
     def __repr__(self) -> str:
@@ -955,7 +957,7 @@ def deserialize(cls, o: Any) -> 'OmniborId':
 
     def __eq__(self, other: Any) -> bool:
         if isinstance(other, OmniborId):
-            return hash(other) == hash(self)
+            return self._id == other._id
         return False
 
     def __lt__(self, other: Any) -> bool:
@@ -1014,7 +1016,7 @@ def deserialize(cls, o: Any) -> 'Swhid':
 
     def __eq__(self, other: Any) -> bool:
         if isinstance(other, Swhid):
-            return hash(other) == hash(self)
+            return self._id == other._id
         return False
 
     def __lt__(self, other: Any) -> bool:

cyclonedx/model/contact.py

@@ -275,6 +275,7 @@ def __lt__(self, other: Any) -> bool:
         return NotImplemented
 
     def __hash__(self) -> int:
+        # TODO
         return hash((self.name, self.phone, self.email))
 
     def __repr__(self) -> str:
@@ -384,6 +385,7 @@ def __lt__(self, other: Any) -> bool:
         return NotImplemented
 
     def __hash__(self) -> int:
+        # TODO
         return hash((self.name, tuple(self.urls), tuple(self.contacts)))
 
     def __repr__(self) -> str:

cyclonedx/model/crypto.py

@@ -501,6 +501,7 @@ def __eq__(self, other: object) -> bool:
         return False
 
     def __hash__(self) -> int:
+        # TODO
         return hash((self.primitive, self._parameter_set_identifier, self.curve, self.execution_environment,
                      self.implementation_platform, tuple(self.certification_levels), self.mode, self.padding,
                      tuple(self.crypto_functions), self.classical_security_level, self.nist_quantum_security_level,))
@@ -673,6 +674,7 @@ def __eq__(self, other: object) -> bool:
         return False
 
     def __hash__(self) -> int:
+        # TODO
         return hash((self.subject_name, self.issuer_name, self.not_valid_before, self.not_valid_after,
                      self.certificate_format, self.certificate_extension))
 
@@ -796,6 +798,7 @@ def __eq__(self, other: object) -> bool:
         return False
 
     def __hash__(self) -> int:
+        # TODO
         return hash((self.mechanism, self.algorithm_ref))
 
     def __repr__(self) -> str:
@@ -1035,6 +1038,7 @@ def __eq__(self, other: object) -> bool:
         return False
 
     def __hash__(self) -> int:
+        # TODO
         return hash((self.type, self.id, self.state, self.algorithm_ref, self.creation_date, self.activation_date,
                      self.update_date, self.expiration_date, self.value, self.size, self.format, self.secured_by))
 
@@ -1152,6 +1156,7 @@ def __lt__(self, other: Any) -> bool:
         return NotImplemented
 
     def __hash__(self) -> int:
+        # TODO
         return hash((self.name, tuple(self.algorithms), tuple(self.identifiers)))
 
     def __repr__(self) -> str:
@@ -1284,6 +1289,7 @@ def __eq__(self, other: object) -> bool:
         return False
 
     def __hash__(self) -> int:
+        # TODO
         return hash((tuple(self.encr), tuple(self.prf), tuple(self.integ), tuple(self.ke), self.esn, tuple(self.auth)))
 
     def __repr__(self) -> str:
@@ -1383,6 +1389,7 @@ def __eq__(self, other: object) -> bool:
         return False
 
     def __hash__(self) -> int:
+        # TODO
         return hash((self.type, self.version, tuple(self.cipher_suites), self.ikev2_transform_types))
 
     def __repr__(self) -> str:
@@ -1539,6 +1546,7 @@ def __lt__(self, other: Any) -> bool:
         return NotImplemented
 
     def __hash__(self) -> int:
+        # TODO
         return hash((self.asset_type, self.algorithm_properties, self.certificate_properties,
                      self.related_crypto_material_properties, self.protocol_properties, self.oid))
 

cyclonedx/model/dependency.py

@@ -99,6 +99,7 @@ def __lt__(self, other: Any) -> bool:
         return NotImplemented
 
     def __hash__(self) -> int:
+        # TODO
         return hash((self.ref, tuple(self.dependencies)))
 
     def __repr__(self) -> str:

cyclonedx/model/issue.py

@@ -105,6 +105,7 @@ def __lt__(self, other: Any) -> bool:
         return NotImplemented
 
     def __hash__(self) -> int:
+        # TODO
         return hash((self.name, self.url))
 
     def __repr__(self) -> str:
@@ -246,6 +247,7 @@ def __lt__(self, other: Any) -> bool:
         return NotImplemented
 
     def __hash__(self) -> int:
+        # TODO
         return hash((
             self.type, self.id, self.name, self.description, self.source, tuple(self.references)
         ))

cyclonedx/model/license.py

@@ -232,6 +232,7 @@ def __lt__(self, other: Any) -> bool:
         return NotImplemented
 
     def __hash__(self) -> int:
+        # TODO
         return hash((self._id, self._name, self._text, self._url, self._acknowledgement))
 
     def __repr__(self) -> str:
@@ -309,6 +310,7 @@ def acknowledgement(self, acknowledgement: Optional[LicenseAcknowledgement]) ->
         self._acknowledgement = acknowledgement
 
     def __hash__(self) -> int:
+        # TODO
         return hash((self._value, self._acknowledgement))
 
     def __eq__(self, other: object) -> bool:

cyclonedx/model/lifecycle.py

@@ -83,7 +83,7 @@ def __hash__(self) -> int:
 
     def __eq__(self, other: object) -> bool:
         if isinstance(other, PredefinedLifecycle):
-            return hash(other) == hash(self)
+            return self._phase == other._phase
         return False
 
     def __lt__(self, other: Any) -> bool:
@@ -143,6 +143,7 @@ def description(self, description: Optional[str]) -> None:
         self._description = description
 
     def __hash__(self) -> int:
+        # TODO
         return hash((self._name, self._description))
 
     def __eq__(self, other: object) -> bool:

cyclonedx/model/release_note.py

@@ -239,6 +239,7 @@ def __eq__(self, other: object) -> bool:
         return False
 
     def __hash__(self) -> int:
+        # TODO
         return hash((
             self.type, self.title, self.featured_image, self.social_image, self.description, self.timestamp,
             tuple(self.aliases), tuple(self.tags), tuple(self.resolves), tuple(self.notes), tuple(self.properties)