Loosen the version requirement for six

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

diff --git a/tasklib/serializing.py b/tasklib/serializing.py
index e980c587f7925e6922041541841a4dd0015cf3b5..8cdeaf286bc8a44cf9c4fafdb7cd689162273ac2 100644 (file)
--- a/tasklib/serializing.py
+++ b/tasklib/serializing.py
@@ -1,11 +1,17 @@
+import datetime
+import importlib
 import json
 import pytz
 import six
 import tzlocal
 
+
+from .lazy import LazyUUIDTaskSet, LazyUUIDTask
+
 DATE_FORMAT = '%Y%m%dT%H%M%SZ'
 local_zone = tzlocal.get_localzone()
 
+
 class SerializingObject(object):
     """
     Common ancestor for TaskResource & TaskWarriorFilter, since they both
@@ -163,6 +169,8 @@ class SerializingObject(object):
         return serialized_annotations if serialized_annotations else ''
 
     def deserialize_annotations(self, data):
+        task_module = importlib.import_module('tasklib.task')
+        TaskAnnotation = getattr(task_module, 'TaskAnnotation')
         return [TaskAnnotation(self, d) for d in data] if data else []
 
     def serialize_tags(self, tags):
@@ -170,17 +178,30 @@ class SerializingObject(object):
 
     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_parent(self, parent):
+        return parent['uuid'] if parent else ''
+
+    def deserialize_parent(self, uuid):
+        return LazyUUIDTask(self.backend, uuid) if uuid else None
 
     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
 
+        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(',')
@@ -188,7 +209,7 @@ class SerializingObject(object):
         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):
         """
@@ -200,8 +221,10 @@ class SerializingObject(object):
         localized datetime -> localized datetime (no conversion)
         """
 
-        if (isinstance(value, datetime.date)
-            and not isinstance(value, datetime.datetime)):
+        if (
+            isinstance(value, datetime.date)
+            and not isinstance(value, datetime.datetime)
+        ):
             # Convert to local midnight
             value_full = datetime.datetime.combine(value, datetime.time.min)
             localized = local_zone.localize(value_full)
@@ -229,5 +252,3 @@ class SerializingObject(object):
                              "not: {}".format(value))
 
         return value
-
-