Merge branch 'release/1.1.0'

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

diff --git a/tasklib/lazy.py b/tasklib/lazy.py
index c3feed574a81eed69f05c5e34733cb1450173602..f9e0c0a67e02a5fc8c0b29c8cfd5c3fcce25c3a1 100644 (file)
--- a/tasklib/lazy.py
+++ b/tasklib/lazy.py
@@ -32,16 +32,25 @@ 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']
 

+    def __ne__(self, other):
+        return not self.__eq__(other)
+

     def __hash__(self):
         return self['uuid'].__hash__()
 
     def __repr__(self):
         return "LazyUUIDTask: {0}".format(self._uuid)
 
     def __hash__(self):
         return self['uuid'].__hash__()
 
     def __repr__(self):
         return "LazyUUIDTask: {0}".format(self._uuid)
 

+    def __copy__(self):
+        return LazyUUIDTask(self._tw, self._uuid)
+
+    def __deepcopy__(self, memo):
+        return LazyUUIDTask(self._tw, self._uuid)
+

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


@@ -49,6 +58,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


@@ -110,18 +127,37 @@ class LazyUUIDTaskSet(object):
     def __isub__(self, other):
         return self.difference_update(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 __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 __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 __le__(self, other):
         return self.issubset(other)