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 e85a2047daecc92fbbe715ceb187b26b952d3816..aa2c0654c23f93e2b361bf286c27d677e05b52a2 100644 (file)
--- a/tasklib/lazy.py
+++ b/tasklib/lazy.py
@@ -29,16 +29,19 @@ class LazyUUIDTask(object):
         # Getattr is called only if the attribute could not be found using
         # normal means
         self.replace()
         # Getattr is called only if the attribute could not be found using
         # normal means
         self.replace()

-        return self.name
+        return getattr(self, name)

 
     def __eq__(self, other):
 
     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']
 
     def __hash__(self):
         return self['uuid'].__hash__()
 
             # For saved Tasks, just define equality by equality of uuids
             return self['uuid'] == other['uuid']
 
     def __hash__(self):
         return self['uuid'].__hash__()
 

+    def __repr__(self):
+        return "LazyUUIDTask: {0}".format(self._uuid)
+

     @property
     def saved(self):
         """
     @property
     def saved(self):
         """


@@ -46,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


@@ -80,11 +91,17 @@ class LazyUUIDTaskSet(object):
             raise AttributeError
         else:
             self.replace()
             raise AttributeError
         else:
             self.replace()

-            return self.name
+            return getattr(self, name)
+
+    def __repr__(self):
+        return "LazyUUIDTaskSet([{0}])".format(', '.join(self._uuids))

 
     def __eq__(self, other):
         return set(t['uuid'] for t in other) == self._uuids
 
 
     def __eq__(self, other):
         return set(t['uuid'] for t in other) == self._uuids
 

+    def __ne__(self, other):
+        return not (self == other)
+

     def __contains__(self, task):
         return task['uuid'] in self._uuids
 
     def __contains__(self, task):
         return task['uuid'] in self._uuids
 


@@ -95,6 +112,99 @@ class LazyUUIDTaskSet(object):
         for uuid in self._uuids:
             yield LazyUUIDTask(self._tw, uuid)
 
         for uuid in self._uuids:
             yield LazyUUIDTask(self._tw, uuid)
 

+    def __sub__(self, other):
+        return self.difference(other)
+
+    def __isub__(self, other):
+        return self.difference_update(other)
+
+    def __rsub__(self, other):
+        return LazyUUIDTaskSet(self._tw,
+            set(t['uuid'] for t in other) - self._uuids)
+
+    def __or__(self, other):
+        return self.union(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
+
+    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