Task: Move formatters to TaskWarrior backend

diff --git a/tasklib/backends.py b/tasklib/backends.py
index 38b88b1ba042401a908f2116f4ac0cacb1189cd2..02d412c1ed491ca6c911bc2a40d3335628883b0f 100644 (file)
--- a/tasklib/backends.py
+++ b/tasklib/backends.py
@@ -139,10 +139,10 @@ class TaskWarrior(object):
             format_default = lambda: six.u("{0}:{1}").format(field,
                                                       escaped_serialized_value)
 
             format_default = lambda: six.u("{0}:{1}").format(field,
                                                       escaped_serialized_value)
 

-            format_func = getattr(task, 'format_{0}'.format(field),
+            format_func = getattr(self, 'format_{0}'.format(field),

                                   format_default)
 
                                   format_default)
 

-            args.append(format_func())
+            args.append(format_func(task))

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


@@ -157,6 +157,35 @@ class TaskWarrior(object):
 
         return args
 
 
         return args
 

+    def format_depends(self, task):
+        # We need to generate added and removed dependencies list,
+        # since Taskwarrior does not accept redefining dependencies.
+
+        # This cannot be part of serialize_depends, since we need
+        # to keep a list of all depedencies in the _data dictionary,
+        # not just currently added/removed ones
+
+        old_dependencies = task._original_data.get('depends', set())
+
+        added = self['depends'] - old_dependencies
+        removed = old_dependencies - self['depends']
+
+        # Removed dependencies need to be prefixed with '-'
+        return 'depends:' + ','.join(
+                [t['uuid'] for t in added] +
+                ['-' + t['uuid'] for t in removed]
+            )
+
+    def format_description(self, task):
+        # Task version older than 2.4.0 ignores first word of the
+        # task description if description: prefix is used
+        if self.version < VERSION_2_4_0:
+            return task._data['description']
+        else:
+            return six.u("description:'{0}'").format(task._data['description'] or '')
+
+
+    # Public interface

 
     def get_config(self):
         raw_output = self.execute_command(
 
     def get_config(self):
         raw_output = self.execute_command(

diff --git a/tasklib/task.py b/tasklib/task.py
index 081646d436ea6d4c825c5a4dd9933a96453fa1fb..211573d68031f605d3b06cff74eaa17655b09bea 100644 (file)
--- a/tasklib/task.py
+++ b/tasklib/task.py
@@ -549,33 +549,6 @@ class Task(TaskResource):
 
         return super(Task, self).serialize_depends(cur_dependencies)
 
 
         return super(Task, self).serialize_depends(cur_dependencies)
 

-    def format_depends(self):
-        # We need to generate added and removed dependencies list,
-        # since Taskwarrior does not accept redefining dependencies.
-
-        # This cannot be part of serialize_depends, since we need
-        # to keep a list of all depedencies in the _data dictionary,
-        # not just currently added/removed ones
-
-        old_dependencies = self._original_data.get('depends', set())
-
-        added = self['depends'] - old_dependencies
-        removed = old_dependencies - self['depends']
-
-        # Removed dependencies need to be prefixed with '-'
-        return 'depends:' + ','.join(
-                [t['uuid'] for t in added] +
-                ['-' + t['uuid'] for t in removed]
-            )
-
-    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 six.u("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")