fix(CVSS2, CVSS3): correct __eq__ methods for consistency

cvss/cvss2.py

@@ -321,14 +321,6 @@ def rh_vector(self):
         """
         return str(self.scores()[0]) + "/" + self.clean_vector()
 
-    def __eq__(self, o):
-        if isinstance(o, CVSS2):
-            return self.clean_vector().__eq__(o.clean_vector())
-        return NotImplemented
-
-    def __hash__(self):
-        return hash(self.clean_vector())
-
     def as_json(self, sort=False, minimal=False):
         """
         Returns a dictionary formatted with attribute names and values defined by the official
@@ -381,3 +373,11 @@ def add_metric_to_data(metric):
             data = OrderedDict(sorted(data.items()))
 
         return data
+
+    def __hash__(self) -> int:
+        return hash(self.clean_vector())
+
+    def __eq__(self, o) -> bool:
+        if isinstance(o, CVSS2):
+            return self.clean_vector() == o.clean_vector()
+        return False

cvss/cvss3.py

@@ -441,14 +441,6 @@ def rh_vector(self):
         """
         return str(self.scores()[0]) + "/" + self.clean_vector()
 
-    def __eq__(self, o):
-        if isinstance(o, CVSS3):
-            return self.clean_vector().__eq__(o.clean_vector())
-        return NotImplemented
-
-    def __hash__(self):
-        return hash(self.clean_vector())
-
     def as_json(self, sort=False, minimal=False):
         """
         Returns a dictionary formatted with attribute names and values defined by the official
@@ -508,3 +500,11 @@ def add_metric_to_data(metric):
         if sort:
             data = OrderedDict(sorted(data.items()))
         return data
+
+    def __hash__(self) -> int:
+        return hash(self.clean_vector())
+
+    def __eq__(self, o) -> bool:
+        if isinstance(o, CVSS3):
+            return self.clean_vector() == o.clean_vector()
+        return False