travis: Do not test with Python 3.2, start testing with Python 3.5

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

diff --git a/tasklib/serializing.py b/tasklib/serializing.py
index e980c587f7925e6922041541841a4dd0015cf3b5..45942851d774550492fe14e96f75d115ebac77dd 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
 
 import json
 import pytz
 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()
 

+

 class SerializingObject(object):
     """
     Common ancestor for TaskResource & TaskWarriorFilter, since they both
 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):
         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):
         return [TaskAnnotation(self, d) for d in data] if data else []
 
     def serialize_tags(self, tags):


@@ -176,11 +184,18 @@ class SerializingObject(object):
     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(',')


@@ -188,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):
         """


@@ -200,8 +215,10 @@ class SerializingObject(object):
         localized datetime -> localized datetime (no conversion)
         """
 
         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)
             # Convert to local midnight
             value_full = datetime.datetime.combine(value, datetime.time.min)
             localized = local_zone.localize(value_full)


@@ -229,5 +246,3 @@ class SerializingObject(object):
                              "not: {}".format(value))
 
         return value
                              "not: {}".format(value))
 
         return value

-
-