Task: Make uuid equality more restrictive for unsaved tasks

diff --git a/tasklib/task.py b/tasklib/task.py
index 8fe1e1b47df278c8d58e8692a266dbc3215ac6c1..1fa3faa675a5022057f70261ddba8f5c1e87fc4b 100644 (file)
--- a/tasklib/task.py
+++ b/tasklib/task.py
@@ -122,10 +122,21 @@ class Task(TaskResource):
         return self['description']
 
     def __eq__(self, other):
-        return self['uuid'] == other['uuid']
+        if self['uuid'] and other['uuid']:
+            # For saved Tasks, just define equality by equality of uuids
+            return self['uuid'] == other['uuid']
+        else:
+            # If the tasks are not saved, compare the actual instances
+            return id(self) == id(other)
+
 
     def __hash__(self):
-        return self['uuid'].__hash__()
+        if self['uuid']:
+            # For saved Tasks, just define equality by equality of uuids
+            return self['uuid'].__hash__()
+        else:
+            # If the tasks are not saved, return hash of instance id
+            return id(self).__hash__()
 
     @property
     def _modified_fields(self):