Merge branch 'develop'

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

diff --git a/tasklib/lazy.py b/tasklib/lazy.py
index a1b63ef4fcf48ce1dfb881564b408f77a0374207..e5b34925b99f5d38aaedba73b2d6bed7f7174d04 100644 (file)
--- a/tasklib/lazy.py
+++ b/tasklib/lazy.py
@@ -36,11 +36,14 @@ class LazyUUIDTask(object):
             # 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):
     def __hash__(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 __copy__(self):
         return LazyUUIDTask(self._tw, self._uuid)


@@ -100,10 +103,10 @@ 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):
 
     def __eq__(self, other):

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

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


@@ -125,8 +128,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)


@@ -168,20 +173,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)