Fix MarathonResource hash as well

marathon/models/base.py

@@ -71,6 +71,12 @@ def __eq__(self, other):
         except:
             return False
 
+    def __hash__(self):
+        # Technically this class shouldn't be hashable because it often
+        # contains mutable fields, but in practice this class is used more
+        # like a record or namedtuple.
+        return hash(self.to_json())
+
     def __str__(self):
         return "{clazz}::".format(clazz=self.__class__.__name__) + str(self.__dict__)
 

tests/test_model_object.py

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 from marathon.models.base import MarathonObject
+from marathon.models.base import MarathonResource
 import unittest
 
 
@@ -19,3 +20,21 @@ def test_hashable(self):
         collection = {}
         collection[obj] = True
         assert collection[obj]
+
+
+class MarathonResourceHashable(unittest.TestCase):
+
+    def test_hashable(self):
+        """
+        Regression test for issue #203
+
+        MarathonResource defined __eq__ but not __hash__, meaning that in
+        in Python2.7 MarathonResources are hashable, but in Python3 they're
+        not
+
+        This test ensures that we are hashable in all versions of python
+        """
+        obj = MarathonResource()
+        collection = {}
+        collection[obj] = True
+        assert collection[obj]