Task: Update _original_data with data dict too when creating Task object

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

diff --git a/tasklib/task.py b/tasklib/task.py
index 5acabe0e2952ecc032002c00079586655ec9fbe1..d9b2678e084b89fb3e7a75867b0fa0f07bbf02e7 100644 (file)
--- a/tasklib/task.py
+++ b/tasklib/task.py
@@ -42,16 +42,22 @@ class TaskResource(object):
         except ValueError:
             pass
 
         except ValueError:
             pass
 

-        hydrate_func = getattr(self, 'deserialize_{0}'.format(key),
-                               lambda x: x)
-        return hydrate_func(self._data.get(key))
+        return self._deserialize(key, self._data.get(key))

 
     def __setitem__(self, key, value):
         if key in self.read_only_fields:
             raise RuntimeError('Field \'%s\' is read-only' % key)
 
     def __setitem__(self, key, value):
         if key in self.read_only_fields:
             raise RuntimeError('Field \'%s\' is read-only' % key)

+        self._data[key] = self._serialize(key, value)
+
+    def _deserialize(self, key, value):
+        hydrate_func = getattr(self, 'deserialize_{0}'.format(key),
+                               lambda x: x)
+        return hydrate_func(value)
+
+    def _serialize(self, key, value):

         dehydrate_func = getattr(self, 'serialize_{0}'.format(key),
                                  lambda x: x)
         dehydrate_func = getattr(self, 'serialize_{0}'.format(key),
                                  lambda x: x)

-        self._data[key] = dehydrate_func(value)
+        return dehydrate_func(value)

 
     def __str__(self):
         s = six.text_type(self.__unicode__())
 
     def __str__(self):
         s = six.text_type(self.__unicode__())


@@ -86,7 +92,7 @@ class TaskAnnotation(TaskResource):
 
 
 class Task(TaskResource):
 
 
 class Task(TaskResource):

-    read_only_fields = ['id', 'entry', 'urgency', 'uuid']
+    read_only_fields = ['id', 'entry', 'urgency', 'uuid', 'modified']

 
     class DoesNotExist(Exception):
         pass
 
     class DoesNotExist(Exception):
         pass


@@ -113,10 +119,18 @@ class Task(TaskResource):
     def __init__(self, warrior, data={}, **kwargs):
         self.warrior = warrior
 
     def __init__(self, warrior, data={}, **kwargs):
         self.warrior = warrior
 

-        # We keep data for backwards compatibility
-        kwargs.update(data)
+        # We serialize the data in kwargs so that users of the library
+        # do not have to pass different data formats via __setitem__ and
+        # __init__ methods, that would be confusing

 
 

-        self._load_data(kwargs)
+        # Rather unfortunate syntax due to python2.6 comaptiblity
+        self._load_data(dict((key, self._serialize(key, value))
+                        for (key, value) in six.iteritems(kwargs)))
+
+        # We keep data for backwards compatibility
+        # TODO: Should we keep this using unserialized access to _data dict?
+        self._data.update(data)
+        self._original_data.update(data)

 
     def __unicode__(self):
         return self['description']
 
     def __unicode__(self):
         return self['description']


@@ -140,7 +154,8 @@ class Task(TaskResource):
 
     @property
     def _modified_fields(self):
 
     @property
     def _modified_fields(self):

-        for key in self._data.keys():
+        writable_fields = set(self._data.keys()) - set(self.read_only_fields)
+        for key in writable_fields:

             if self._data.get(key) != self._original_data.get(key):
                 yield key
 
             if self._data.get(key) != self._original_data.get(key):
                 yield key