SerializingObject: Serialize tags into sets, not lists

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

diff --git a/tasklib/serializing.py b/tasklib/serializing.py
index 767f7df7cc47f3cb52dfd0f85a084b1af4e0bea5..ff9b9778df90deb6a8e11a95a9ee95a98ecb3c25 100644 (file)
--- a/tasklib/serializing.py
+++ b/tasklib/serializing.py
@@ -5,6 +5,9 @@ import pytz
 import six
 import tzlocal
 
 import six
 import tzlocal
 

+
+from .lazy import LazyUUIDTaskSet
+

 DATE_FORMAT = '%Y%m%dT%H%M%SZ'
 local_zone = tzlocal.get_localzone()
 
 DATE_FORMAT = '%Y%m%dT%H%M%SZ'
 local_zone = tzlocal.get_localzone()
 


@@ -175,17 +178,24 @@ class SerializingObject(object):
 
     def deserialize_tags(self, tags):
         if isinstance(tags, six.string_types):
 
     def deserialize_tags(self, tags):
         if isinstance(tags, six.string_types):

-            return tags.split(',') if tags else []
-        return tags or []
+            return set(tags.split(',')) if tags else set()
+        return set(tags or [])

 
     def serialize_depends(self, value):
         # Return the list of uuids
         value = value if value is not None else set()
 
     def serialize_depends(self, value):
         # Return the list of uuids
         value = value if value is not None else set()

-        return ','.join(task['uuid'] for task in value)
+
+        if isinstance(value, LazyUUIDTaskSet):
+            return ','.join(value._uuids)
+        else:
+            return ','.join(task['uuid'] for task in value)

 
     def deserialize_depends(self, raw_uuids):
         raw_uuids = raw_uuids or []  # Convert None to empty list
 
 
     def deserialize_depends(self, raw_uuids):
         raw_uuids = raw_uuids or []  # Convert None to empty list
 

+        if not raw_uuids:
+            return set()
+

         # TW 2.4.4 encodes list of dependencies as a single string
         if type(raw_uuids) is not list:
             uuids = raw_uuids.split(',')
         # TW 2.4.4 encodes list of dependencies as a single string
         if type(raw_uuids) is not list:
             uuids = raw_uuids.split(',')


@@ -193,7 +203,7 @@ class SerializingObject(object):
         else:
             uuids = raw_uuids
 
         else:
             uuids = raw_uuids
 

-        return set(self.backend.tasks.get(uuid=uuid) for uuid in uuids if uuid)
+        return LazyUUIDTaskSet(self.backend, uuids)

 
     def datetime_normalizer(self, value):
         """
 
     def datetime_normalizer(self, value):
         """