0.9.2

CHANGES.md

@@ -1,3 +1,7 @@
+0.9.2 (2017-08-30)
+==================
+- Fix `__eq__` method for main resources.
+
 0.9.1 (2017-08-23)
 ==================
 - Fix small bug for interruptible instances.

VERSION

@@ -1 +1 @@
-0.9.1
+0.9.2

sevenbridges/__init__.py

@@ -6,7 +6,7 @@
 """
 import logging
 
-__version__ = "0.9.1"
+__version__ = "0.9.2"
 
 from sevenbridges.api import Api
 from sevenbridges.config import Config

sevenbridges/models/app.py

@@ -41,7 +41,10 @@ def id(self):
             return self._id
 
     def __eq__(self, other):
-        return self.id == other.id and self.__class__ == other.__class__
+        if self is other:
+            return True
+        else:
+            return self.id == other.id and self.__class__ == other.__class__
 
     def __str__(self):
         return six.text_type('<App: id={id} rev={rev}>'.format(

sevenbridges/models/billing_group.py

@@ -29,7 +29,10 @@ def __str__(self):
         return six.text_type('<BillingGroup: id={id}>'.format(id=self.id))
 
     def __eq__(self, other):
-        return self.id == other.id and self.__class__ == other.__class__
+        if self is other:
+            return True
+        else:
+            return self.id == other.id and self.__class__ == other.__class__
 
     @classmethod
     def query(cls, offset=None, limit=None, api=None):

sevenbridges/models/division.py

@@ -21,7 +21,10 @@ def __str__(self):
         return six.text_type('<Division: id={id}>'.format(id=self.id))
 
     def __eq__(self, other):
-        return self.id == other.id and self.__class__ == other.__class__
+        if self is other:
+            return True
+        else:
+            return self.id == other.id and self.__class__ == other.__class__
 
     @classmethod
     def query(cls, offset=None, limit=None, api=None):

sevenbridges/models/file.py

@@ -55,7 +55,10 @@ def __str__(self):
         return six.text_type('<File: id={id}>'.format(id=self.id))
 
     def __eq__(self, other):
-        return self.id == other.id and self.__class__ == other.__class__
+        if self is other:
+            return True
+        else:
+            return self.id == other.id and self.__class__ == other.__class__
 
     @classmethod
     def query(cls, project, names=None, metadata=None, origin=None, tags=None,

sevenbridges/models/invoice.py

@@ -28,7 +28,10 @@ def __str__(self):
         return six.text_type('<Invoice: id={id}>'.format(id=self.id))
 
     def __eq__(self, other):
-        return self.id == other.id and self.__class__ == other.__class__
+        if self is other:
+            return True
+        else:
+            return self.id == other.id and self.__class__ == other.__class__
 
     @classmethod
     def query(cls, offset=None, limit=None, api=None):

sevenbridges/models/marker.py

@@ -34,7 +34,10 @@ def __str__(self):
         return six.text_type('<Marker: id={id}>'.format(id=self.id))
 
     def __eq__(self, other):
-        return self.id == other.id and self.__class__ == other.__class__
+        if self is other:
+            return True
+        else:
+            return self.id == other.id and self.__class__ == other.__class__
 
     @classmethod
     def query(cls, file, offset=None, limit=None, api=None):

sevenbridges/models/member.py

@@ -31,7 +31,10 @@ def __str__(self):
                              .format(id=self.id))
 
     def __eq__(self, other):
-        return self.id == other.id and self.__class__ == other.__class__
+        if self is other:
+            return True
+        else:
+            return self.id == other.id and self.__class__ == other.__class__
 
     @inplace_reload
     def save(self, inplace=True):

sevenbridges/models/project.py

@@ -45,7 +45,10 @@ def __str__(self):
         return six.text_type('<Project: id={id}>'.format(id=self.id))
 
     def __eq__(self, other):
-        return self.id == other.id and self.__class__ == other.__class__
+        if self is other:
+            return True
+        else:
+            return self.id == other.id and self.__class__ == other.__class__
 
     @classmethod
     def query(cls, owner=None, offset=None, limit=None, api=None):

sevenbridges/models/storage_export.py

@@ -42,7 +42,10 @@ def __str__(self):
         return six.text_type('<Export: id={id}>'.format(id=self.id))
 
     def __eq__(self, other):
-        return self.id == other.id and self.__class__ == other.__class__
+        if self is other:
+            return True
+        else:
+            return self.id == other.id and self.__class__ == other.__class__
 
     @property
     def source(self):

sevenbridges/models/storage_import.py

@@ -43,7 +43,10 @@ def __str__(self):
         return six.text_type('<Import: id={id}>'.format(id=self.id))
 
     def __eq__(self, other):
-        return self.id == other.id and self.__class__ == other.__class__
+        if self is other:
+            return True
+        else:
+            return self.id == other.id and self.__class__ == other.__class__
 
     @property
     def result(self):

sevenbridges/models/task.py

@@ -68,7 +68,10 @@ def __str__(self):
         return six.text_type('<Task: id={id}>'.format(id=self.id))
 
     def __eq__(self, other):
-        return self.id == other.id and self.__class__ == other.__class__
+        if self is other:
+            return True
+        else:
+            return self.id == other.id and self.__class__ == other.__class__
 
     @classmethod
     def query(cls, project=None, status=None, batch=None,

sevenbridges/models/team.py

@@ -33,7 +33,10 @@ def __str__(self):
         return six.text_type('<Team: id={id}>'.format(id=self.id))
 
     def __eq__(self, other):
-        return self.id == other.id and self.__class__ == other.__class__
+        if self is other:
+            return True
+        else:
+            return self.id == other.id and self.__class__ == other.__class__
 
     @classmethod
     def query(cls, division, offset=None, limit=None, api=None):

sevenbridges/models/team_member.py

@@ -17,9 +17,12 @@ class TeamMember(Resource):
     username = StringField(read_only=False)
     role = StringField(read_only=True)
 
+    def __eq__(self, other):
+        if self is other:
+            return True
+        else:
+            return self.id == other.id and self.__class__ == other.__class__
+
     def __str__(self):
         return six.text_type('<Team member: username={username}>'
                              .format(username=self.username))
-
-    def __eq__(self, other):
-        return self.id == other.id and self.__class__ == other.__class__

sevenbridges/models/user.py

@@ -31,7 +31,10 @@ class User(Resource):
     city = StringField(read_only=True)
 
     def __eq__(self, other):
-        return self.username == other.username
+        if self is other:
+            return True
+        else:
+            return self.username == other.username
 
     def __str__(self):
         return six.text_type(

sevenbridges/models/volume.py

@@ -45,6 +45,12 @@ class Volume(Resource):
     modified_on = DateTimeField(read_only=True)
     active = BooleanField(read_only=True)
 
+    def __eq__(self, other):
+        if self is other:
+            return True
+        else:
+            return self.id == other.id and self.__class__ == other.__class__
+
     def __str__(self):
         return six.text_type('<Volume: id={id}>'.format(id=self.id))