Merge pull request #51 from nesaro/patch-1

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

diff --git a/tasklib/lazy.py b/tasklib/lazy.py
index d294341e13249426de073b6ae3bbad2cf010e505..7d8e0de160171a1fc0325bcb3fcd535b4527d545 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']
 


@@ -40,7 +40,13 @@ class LazyUUIDTask(object):
         return self['uuid'].__hash__()
 
     def __repr__(self):
         return self['uuid'].__hash__()
 
     def __repr__(self):

-        return "LazyUUIDTask: {0}".format(self._uuid)
+        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 +55,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


@@ -86,7 +100,7 @@ class LazyUUIDTaskSet(object):
             return getattr(self, name)
 
     def __repr__(self):
             return getattr(self, name)
 
     def __repr__(self):

-        return "LazyUUIDTaskSet([{0}])".format(', '.join(self._uuids))
+        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


@@ -111,8 +125,10 @@ class LazyUUIDTaskSet(object):
         return self.difference_update(other)
 
     def __rsub__(self, other):
         return self.difference_update(other)
 
     def __rsub__(self, other):

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

 
     def __or__(self, other):
         return self.union(other)
 
     def __or__(self, other):
         return self.union(other)


@@ -132,6 +148,15 @@ class LazyUUIDTaskSet(object):
     def __rxor__(self, other):
         return self.symmetric_difference(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)
 


@@ -145,20 +170,28 @@ class LazyUUIDTaskSet(object):
         return all([task in self for task in other])
 
     def union(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))
+        return LazyUUIDTaskSet(
+            self._tw,
+            self._uuids | set(t['uuid'] for t in other),
+        )

 
     def intersection(self, other):
 
     def intersection(self, other):

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

 
     def difference(self, other):
 
     def difference(self, other):

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

 
     def symmetric_difference(self, other):
 
     def symmetric_difference(self, other):

-        return LazyUUIDTaskSet(self._tw,
-            self._uuids ^ set(t['uuid'] for t in 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)
 
     def update(self, other):
         self._uuids |= set(t['uuid'] for t in other)