added super().__eq__ calls in model files and removed self_link from comparison

Author: vogljonathan

frost_sta_client/__version__.py

@@ -1,5 +1,5 @@
 __title__ = 'frost_sta_client'
-__version__ = '1.1.42'
+__version__ = '1.1.43'
 __license__ = 'LGPL3'
 __author__ = 'Jonathan Vogl'
 __copyright__ = 'Fraunhofer IOSB'

frost_sta_client/model/actuator.py

@@ -135,12 +135,8 @@ def ensure_service_on_children(self, service):
             self.tasking_capabilities.set_service(service)
 
     def __eq__(self, other):
-        if other is None:
+        if not super().__eq__(other):
             return False
-        if not isinstance(other, type(self)):
-            return False
-        if id(self) == id(other):
-            return True
         if self.name != other.name:
             return False
         if self.description != other.description:

frost_sta_client/model/datastream.py

@@ -257,12 +257,8 @@ def ensure_service_on_children(self, service):
             self.observations.set_service(service)
 
     def __eq__(self, other):
-        if other is None:
+        if not super().__eq__(other):
             return False
-        if not isinstance(other, type(self)):
-            return False
-        if id(self) == id(other):
-            return True
         if self.name != other.name:
             return False
         if self.description != other.description:

frost_sta_client/model/entity.py

@@ -111,8 +111,6 @@ def __eq__(self, other):
             return True
         if self.id != other.id:
             return False
-        if self.self_link != other.self_link:
-            return False
         return True
 
     def __ne__(self, other):

frost_sta_client/model/ext/unitofmeasurement.py

@@ -74,6 +74,8 @@ def __eq__(self, other):
             return False
         if not isinstance(other, type(self)):
             return False
+        if id(self) == id(other):
+            return True
         if self.name != other.name:
             return False
         if self.definition != other.definition:

frost_sta_client/model/feature_of_interest.py

@@ -149,12 +149,8 @@ def ensure_service_on_children(self, service):
             self.observations.set_service(service)
 
     def __eq__(self, other):
-        if other is None:
+        if not super().__eq__(other):
             return False
-        if not isinstance(other, type(self)):
-            return False
-        if id(self) == id(other):
-            return True
         if self.name != other.name:
             return False
         if self.properties != other.properties:

frost_sta_client/model/historical_location.py

@@ -91,12 +91,8 @@ def ensure_service_on_children(self, service):
             self.thing.set_service(service)
 
     def __eq__(self, other):
-        if other is None:
+        if not super().__eq__(other):
             return False
-        if not isinstance(other, type(self)):
-            return False
-        if id(self) == id(other):
-            return True
         if self.time != other.time:
             return False
         return True

frost_sta_client/model/location.py

@@ -187,12 +187,8 @@ def ensure_service_on_children(self, service):
             self.historical_locations.set_service(service)
 
     def __eq__(self, other):
-        if other is None:
+        if not super().__eq__(other):
             return False
-        if not isinstance(other, type(self)):
-            return False
-        if id(self) == id(other):
-            return True
         if self.name != other.name:
             return False
         if self.description != other.description:

frost_sta_client/model/multi_datastream.py

@@ -252,12 +252,8 @@ def ensure_service_on_children(self, service):
             self.observed_properties.set_service(service)
 
     def __eq__(self, other):
-        if other is None:
+        if not super().__eq__(other):
             return False
-        if not isinstance(other, type(self)):
-            return False
-        if id(self) == id(other):
-            return True
         if self.name != other.name:
             return False
         if self.description != other.description:

frost_sta_client/model/observation.py

@@ -186,12 +186,8 @@ def ensure_service_on_children(self, service):
             self.feature_of_interest.set_service(service)
 
     def __eq__(self, other):
-        if other is None:
+        if not super().__eq__(other):
             return False
-        if not isinstance(other, type(self)):
-            return False
-        if id(self) == id(other):
-            return True
         if self.result != other.result:
             return False
         if self.phenomenon_time != other.phenomenon_time: