X-Git-Url: https://git.madduck.net/etc/taskwarrior.git/blobdiff_plain/dd44e7a4b6a175a6d88d16ccb2bd6ca05f6d9dc5..f58549e864220709de81b141b0343195e70fc6f5:/tasklib/task.py

diff --git a/tasklib/task.py b/tasklib/task.py
index f0bb3a8..6e3e432 100644
--- a/tasklib/task.py
+++ b/tasklib/task.py
@@ -13,6 +13,8 @@ DATE_FORMAT = '%Y%m%dT%H%M%SZ'
 REPR_OUTPUT_SIZE = 10
 PENDING = 'pending'
 COMPLETED = 'completed'
+DELETED = 'deleted'
+WAITING = 'waiting'
 
 logger = logging.getLogger(__name__)
 
@@ -39,7 +41,7 @@ class ReadOnlyDictView(object):
         return len(self.viewed_dict)
 
     def __unicode__(self):
-        return u'ReadOnlyDictView: {0}'.format(repr(self.viewed_dict))
+        return six.u('ReadOnlyDictView: {0}'.format(repr(self.viewed_dict)))
 
     __repr__ = __unicode__
 
@@ -165,6 +167,9 @@ class TaskAnnotation(TaskResource):
         # their data dics are the same
         return self.task == other.task and self._data == other._data
 
+    def __ne__(self, other):
+        return not self.__eq__(other)
+
     __repr__ = __unicode__
 
 
@@ -277,6 +282,9 @@ class Task(TaskResource):
             # If the tasks are not saved, compare the actual instances
             return id(self) == id(other)
 
+    def __ne__(self, other):
+        return not self.__eq__(other)
+
     def __hash__(self):
         if self['uuid']:
             # For saved Tasks, just define equality by equality of uuids
@@ -504,6 +512,12 @@ class TaskQuerySet(object):
     def completed(self):
         return self.filter(status=COMPLETED)
 
+    def deleted(self):
+        return self.filter(status=DELETED)
+
+    def waiting(self):
+        return self.filter(status=WAITING)
+
     def filter(self, *args, **kwargs):
         """
         Returns a new TaskQuerySet with the given filters added.