Merge branch 'release/0.11.0'

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

diff --git a/tasklib/serializing.py b/tasklib/serializing.py
index e980c587f7925e6922041541841a4dd0015cf3b5..767f7df7cc47f3cb52dfd0f85a084b1af4e0bea5 100644 (file)
--- a/tasklib/serializing.py
+++ b/tasklib/serializing.py
@@ -1,3 +1,5 @@
+import datetime
+import importlib
 import json
 import pytz
 import six
@@ -6,6 +8,7 @@ import tzlocal
 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 +166,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):
@@ -200,8 +205,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 +236,3 @@ class SerializingObject(object):
                              "not: {}".format(value))
 
         return value
-
-