[fix] small fix to rebuild

[etc/taskwarrior.git] / tasklib / task.py

diff --git a/tasklib/task.py b/tasklib/task.py
index f0bb3a80904252cbf5342a45a94af7c3a22fb031..c97aee8af0a8a02ff6b51d5d5db45420e4bec268 100644 (file)
--- a/tasklib/task.py
+++ b/tasklib/task.py
@@ -13,6 +13,9 @@ DATE_FORMAT = '%Y%m%dT%H%M%SZ'
 REPR_OUTPUT_SIZE = 10
 PENDING = 'pending'
 COMPLETED = 'completed'
 REPR_OUTPUT_SIZE = 10
 PENDING = 'pending'
 COMPLETED = 'completed'

+DELETED = 'deleted'
+WAITING = 'waiting'
+RECURRING = 'recurring'

 
 logger = logging.getLogger(__name__)
 
 
 logger = logging.getLogger(__name__)
 


@@ -39,7 +42,7 @@ class ReadOnlyDictView(object):
         return len(self.viewed_dict)
 
     def __unicode__(self):
         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__
 
 
     __repr__ = __unicode__
 


@@ -165,6 +168,9 @@ class TaskAnnotation(TaskResource):
         # their data dics are the same
         return self.task == other.task and self._data == other._data
 
         # 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__
 
 
     __repr__ = __unicode__
 
 


@@ -277,6 +283,9 @@ class Task(TaskResource):
             # If the tasks are not saved, compare the actual instances
             return id(self) == id(other)
 
             # 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
     def __hash__(self):
         if self['uuid']:
             # For saved Tasks, just define equality by equality of uuids


@@ -301,6 +310,10 @@ class Task(TaskResource):
     def pending(self):
         return self['status'] == six.text_type('pending')
 
     def pending(self):
         return self['status'] == six.text_type('pending')
 

+    @property
+    def recurring(self):
+        return self['status'] == six.text_type('recurring')
+

     @property
     def active(self):
         return self['start'] is not None
     @property
     def active(self):
         return self['start'] is not None


@@ -320,7 +333,8 @@ class Task(TaskResource):
 
     def delete(self):
         if not self.saved:
 
     def delete(self):
         if not self.saved:

-            raise Task.NotSaved("Task needs to be saved before it can be deleted")
+            raise Task.NotSaved(
+                "Task needs to be saved before it can be deleted")

 
         # Refresh the status, and raise exception if the task is deleted
         self.refresh(only_fields=['status'])
 
         # Refresh the status, and raise exception if the task is deleted
         self.refresh(only_fields=['status'])


@@ -335,7 +349,8 @@ class Task(TaskResource):
 
     def start(self):
         if not self.saved:
 
     def start(self):
         if not self.saved:

-            raise Task.NotSaved("Task needs to be saved before it can be started")
+            raise Task.NotSaved(
+                "Task needs to be saved before it can be started")

 
         # Refresh, and raise exception if task is already completed/deleted
         self.refresh(only_fields=['status'])
 
         # Refresh, and raise exception if task is already completed/deleted
         self.refresh(only_fields=['status'])


@@ -354,7 +369,8 @@ class Task(TaskResource):
 
     def stop(self):
         if not self.saved:
 
     def stop(self):
         if not self.saved:

-            raise Task.NotSaved("Task needs to be saved before it can be stopped")
+            raise Task.NotSaved(
+                "Task needs to be saved before it can be stopped")

 
         # Refresh, and raise exception if task is already completed/deleted
         self.refresh(only_fields=['status'])
 
         # Refresh, and raise exception if task is already completed/deleted
         self.refresh(only_fields=['status'])


@@ -369,7 +385,8 @@ class Task(TaskResource):
 
     def done(self):
         if not self.saved:
 
     def done(self):
         if not self.saved:

-            raise Task.NotSaved("Task needs to be saved before it can be completed")
+            raise Task.NotSaved(
+                "Task needs to be saved before it can be completed")

 
         # Refresh, and raise exception if task is already completed/deleted
         self.refresh(only_fields=['status'])
 
         # Refresh, and raise exception if task is already completed/deleted
         self.refresh(only_fields=['status'])


@@ -504,6 +521,15 @@ class TaskQuerySet(object):
     def completed(self):
         return self.filter(status=COMPLETED)
 
     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 recurring(self):
+        return self.filter(status=RECURRING)
+

     def filter(self, *args, **kwargs):
         """
         Returns a new TaskQuerySet with the given filters added.
     def filter(self, *args, **kwargs):
         """
         Returns a new TaskQuerySet with the given filters added.