Skip to content

Commit

Permalink
Merge branch 'geomar-madolf-geomar-fix-compare-local-and-server-objects'
Browse files Browse the repository at this point in the history
  • Loading branch information
vogljonathan committed Aug 22, 2023
2 parents 097a557 + 459581f commit 6902517
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion frost_sta_client/__version__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
__title__ = 'frost_sta_client'
__version__ = '1.1.43'
__version__ = '1.1.44'
__license__ = 'LGPL3'
__author__ = 'Jonathan Vogl'
__copyright__ = 'Fraunhofer IOSB'
Expand Down
5 changes: 3 additions & 2 deletions frost_sta_client/model/entity.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,9 @@ def __eq__(self, other):
return False
if id(self) == id(other):
return True
if self.id != other.id:
return False
if self.id is not None and other.id is not None:
if self.id != other.id:
return False
return True

def __ne__(self, other):
Expand Down

0 comments on commit 6902517

Please sign in to comment.