Task: Check that we are unable to set read only values through __init__

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

diff --git a/tasklib/task.py b/tasklib/task.py
index 1bd3ce7030271709e937e01dc4447610bc916f76..3a58e50895c0ad0d739930a44c1487e813b24e15 100644 (file)
--- a/tasklib/task.py
+++ b/tasklib/task.py
@@ -132,6 +132,11 @@ class Task(TaskResource):
     def __init__(self, warrior, **kwargs):
         self.warrior = warrior
 
     def __init__(self, warrior, **kwargs):
         self.warrior = warrior
 

+        # Check that user is not able to set read-only value in __init__
+        for key in kwargs.keys():
+            if key in self.read_only_fields:
+                raise RuntimeError('Field \'%s\' is read-only' % key)
+

         # 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
         # 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


@@ -227,7 +232,7 @@ class Task(TaskResource):
         removed = old_dependencies - self['depends']
 
         # Removed dependencies need to be prefixed with '-'
         removed = old_dependencies - self['depends']
 
         # Removed dependencies need to be prefixed with '-'

-        return ','.join(
+        return 'depends:' + ','.join(

                 [t['uuid'] for t in added] +
                 ['-' + t['uuid'] for t in removed]
             )
                 [t['uuid'] for t in added] +
                 ['-' + t['uuid'] for t in removed]
             )


@@ -243,6 +248,14 @@ class Task(TaskResource):
     def serialize_tags(self, tags):
         return ','.join(tags) if tags else ''
 
     def serialize_tags(self, tags):
         return ','.join(tags) if tags else ''
 

+    def format_description(self):
+        # Task version older than 2.4.0 ignores first word of the
+        # task description if description: prefix is used
+        if self.warrior.version < VERSION_2_4_0:
+            return self._data['description']
+        else:
+            return "description:'{0}'".format(self._data['description'] or '')
+

     def delete(self):
         if not self.saved:
             raise Task.NotSaved("Task needs to be saved before it can be deleted")
     def delete(self):
         if not self.saved:
             raise Task.NotSaved("Task needs to be saved before it can be deleted")


@@ -253,9 +266,7 @@ class Task(TaskResource):
         if self.deleted:
             raise Task.DeletedTask("Task was already deleted")
 
         if self.deleted:
             raise Task.DeletedTask("Task was already deleted")
 

-        self.warrior.execute_command([self['uuid'], 'delete'], config_override={
-            'confirmation': 'no',
-        })
+        self.warrior.execute_command([self['uuid'], 'delete'])

 
         # Refresh the status again, so that we have updated info stored
         self.refresh(only_fields=['status'])
 
         # Refresh the status again, so that we have updated info stored
         self.refresh(only_fields=['status'])


@@ -320,15 +331,12 @@ class Task(TaskResource):
         args = []
 
         def add_field(field):
         args = []
 
         def add_field(field):

-            # Task version older than 2.4.0 ignores first word of the
-            # task description if description: prefix is used
-            if self.warrior.version < VERSION_2_4_0 and field == 'description':
-                args.append(self._data[field])
-            elif field == 'depends':
-                args.append('{0}:{1}'.format(field, self.format_depends()))
-            else:
-                # Use empty string to substitute for None value
-                args.append('{0}:{1}'.format(field, self._data[field] or ''))
+            # Add the output of format_field method to args list (defaults to
+            # field:value)
+            format_default = lambda k: "{0}:'{1}'".format(k, self._data[k] or '')
+            format_func = getattr(self, 'format_{0}'.format(field),
+                                  lambda: format_default(field))
+            args.append(format_func())

 
         # If we're modifying saved task, simply pass on all modified fields
         if self.saved:
 
         # If we're modifying saved task, simply pass on all modified fields
         if self.saved:


@@ -512,6 +520,7 @@ class TaskWarrior(object):
             os.makedirs(data_location)
         self.config = {
             'data.location': os.path.expanduser(data_location),
             os.makedirs(data_location)
         self.config = {
             'data.location': os.path.expanduser(data_location),

+            'confirmation': 'no',

         }
         self.tasks = TaskQuerySet(self)
         self.version = self._get_version()
         }
         self.tasks = TaskQuerySet(self)
         self.version = self._get_version()


@@ -569,6 +578,4 @@ class TaskWarrior(object):
         })
 
     def undo(self):
         })
 
     def undo(self):

-        self.execute_command(['undo'], config_override={
-            'confirmation': 'no',
-        })
+        self.execute_command(['undo'])