Merge branch 'release/0.12.0' into develop

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

diff --git a/tasklib/lazy.py b/tasklib/lazy.py
index 04ccdf5216f7bee3f3b5c83d24b304c3e095bc22..aa2c0654c23f93e2b361bf286c27d677e05b52a2 100644 (file)
--- a/tasklib/lazy.py
+++ b/tasklib/lazy.py
@@ -32,7 +32,7 @@ class LazyUUIDTask(object):
         return getattr(self, name)
 
     def __eq__(self, other):
         return getattr(self, name)
 
     def __eq__(self, other):

-        if other['uuid']:
+        if other and other['uuid']:

             # For saved Tasks, just define equality by equality of uuids
             return self['uuid'] == other['uuid']
 
             # For saved Tasks, just define equality by equality of uuids
             return self['uuid'] == other['uuid']
 


@@ -49,6 +49,14 @@ class LazyUUIDTask(object):
         """
         return True
 
         """
         return True
 

+    @property
+    def _modified_fields(self):
+        return set()
+
+    @property
+    def modified(self):
+        return False
+

     def replace(self):
         """
         Performs conversion to the regular Task object, referenced by the
     def replace(self):
         """
         Performs conversion to the regular Task object, referenced by the


@@ -105,21 +113,98 @@ class LazyUUIDTaskSet(object):
             yield LazyUUIDTask(self._tw, uuid)
 
     def __sub__(self, other):
             yield LazyUUIDTask(self._tw, uuid)
 
     def __sub__(self, other):

-        return LazyUUIDTaskSet(self._tw,
-                               self._uuids - set(t['uuid'] for t in other))
+        return self.difference(other)

 
     def __isub__(self, other):
 
     def __isub__(self, other):

-        self._uuids -= set(t['uuid'] for t in other)
-        return self
+        return self.difference_update(other)

 
 

-    def __or__(self, other):
+    def __rsub__(self, other):

         return LazyUUIDTaskSet(self._tw,
         return LazyUUIDTaskSet(self._tw,

-                               self._uuids | set(t['uuid'] for t in other))
+            set(t['uuid'] for t in other) - self._uuids)
+
+    def __or__(self, other):
+        return self.union(other)

 
     def __ior__(self, other):
 
     def __ior__(self, other):

+        return self.update(other)
+
+    def __ror__(self, other):
+        return self.union(other)
+
+    def __xor__(self, other):
+        return self.symmetric_difference(other)
+
+    def __ixor__(self, other):
+        return self.symmetric_difference_update(other)
+
+    def __rxor__(self, other):
+        return self.symmetric_difference(other)
+
+    def __and__(self, other):
+        return self.intersection(other)
+
+    def __iand__(self, other):
+        return self.intersection_update(other)
+
+    def __rand__(self, other):
+        return self.intersection(other)
+
+    def __le__(self, other):
+        return self.issubset(other)
+
+    def __ge__(self, other):
+        return self.issuperset(other)
+
+    def issubset(self, other):
+        return all([task in other for task in self])
+
+    def issuperset(self, other):
+        return all([task in self for task in other])
+
+    def union(self, other):
+        return LazyUUIDTaskSet(self._tw,
+            self._uuids | set(t['uuid'] for t in other))
+
+    def intersection(self, other):
+        return LazyUUIDTaskSet(self._tw,
+            self._uuids & set(t['uuid'] for t in other))
+
+    def difference(self, other):
+        return LazyUUIDTaskSet(self._tw,
+            self._uuids - set(t['uuid'] for t in other))
+
+    def symmetric_difference(self, other):
+        return LazyUUIDTaskSet(self._tw,
+            self._uuids ^ set(t['uuid'] for t in other))
+
+    def update(self, other):

         self._uuids |= set(t['uuid'] for t in other)
         return self
 
         self._uuids |= set(t['uuid'] for t in other)
         return self
 

+    def intersection_update(self, other):
+        self._uuids &= set(t['uuid'] for t in other)
+        return self
+
+    def difference_update(self, other):
+        self._uuids -= set(t['uuid'] for t in other)
+        return self
+
+    def symmetric_difference_update(self, other):
+        self._uuids ^= set(t['uuid'] for t in other)
+        return self
+
+    def add(self, task):
+        self._uuids.add(task['uuid'])
+
+    def remove(self, task):
+        self._uuids.remove(task['uuid'])
+
+    def pop(self):
+        return self._uuids.pop()
+
+    def clear(self):
+        self._uuids.clear()
+

     def replace(self):
         """
         Performs conversion to the regular TaskQuerySet object, referenced by
     def replace(self):
         """
         Performs conversion to the regular TaskQuerySet object, referenced by