TaskResource: Do not serialize annotations as a list in a string

diff --git a/tasklib/task.py b/tasklib/task.py
index d386f82faf32cd7e1152afc2d884e6aa82e646dc..a273815e72befb208a6c144dbe3d706c64f24cbd 100644 (file)
--- a/tasklib/task.py
+++ b/tasklib/task.py
@@ -101,12 +101,12 @@ class SerializingObject(object):
 
     def serialize_annotations(self, value):
         value = value if value is not None else []
-        serialized_annotations = [annotation.export_data() for annotation in value]
 
-        if serialized_annotations:
-            return '[' + ','.join(serialized_annotations) + ']'
-        else:
-            return ''
+        # This may seem weird, but it's correct, we want to export
+        # a list of dicts as serialized value
+        serialized_annotations = [json.loads(annotation.export_data())
+                                  for annotation in value]
+        return serialized_annotations if serialized_annotations else ''
 
     def deserialize_annotations(self, data):
         return [TaskAnnotation(self, d) for d in data] if data else []

diff --git a/tasklib/tests.py b/tasklib/tests.py
index 686e0868b352e7e9fcd21d41e3fb527aeaaa95db..3a3f25dac5be66c66c046162dd9a3313eca6fae4 100644 (file)
--- a/tasklib/tests.py
+++ b/tasklib/tests.py
@@ -595,7 +595,7 @@ class AnnotationTest(TasklibTest):
         t.add_annotation("annotation1")
         t.add_annotation("annotation2")
 
-        data = json.loads(t._serialize('annotations', t._data['annotations']))
+        data = t._serialize('annotations', t._data['annotations'])
 
         self.assertEqual(len(data), 2)
         self.assertEqual(type(data[0]), dict)