X-Git-Url: https://git.madduck.net/etc/taskwarrior.git/blobdiff_plain/ff666e5453d71418ca45ee0542a82e2c58ef8442..945af7d4fcb8195b5ee88a37c109cebc7ad1b210:/tasklib/task.py diff --git a/tasklib/task.py b/tasklib/task.py index f30cc61..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__) @@ -38,6 +40,11 @@ class ReadOnlyDictView(object): def __len__(self): return len(self.viewed_dict) + def __unicode__(self): + return six.u('ReadOnlyDictView: {0}'.format(repr(self.viewed_dict))) + + __repr__ = __unicode__ + def get(self, key, default=None): return copy.deepcopy(self.viewed_dict.get(key, default)) @@ -160,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__ @@ -272,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 @@ -499,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.