X-Git-Url: https://git.madduck.net/etc/taskwarrior.git/blobdiff_plain/bc24f9ebe350e46d9e54969f0852e7bda4be16c5..f4936467c1b535b335f6fcf5a5344e72de1437ef:/tasklib/task.py

diff --git a/tasklib/task.py b/tasklib/task.py
index 0953588..9eff14c 100644
--- a/tasklib/task.py
+++ b/tasklib/task.py
@@ -12,6 +12,11 @@ REPR_OUTPUT_SIZE = 10
 PENDING = 'pending'
 COMPLETED = 'completed'
 
+VERSION_2_1_0 = six.u('2.1.0')
+VERSION_2_2_0 = six.u('2.2.0')
+VERSION_2_3_0 = six.u('2.3.0')
+VERSION_2_4_0 = six.u('2.4.0')
+
 logger = logging.getLogger(__name__)
 
 
@@ -95,9 +100,13 @@ class Task(TaskResource):
         """
         pass
 
-    def __init__(self, warrior, data={}):
+    def __init__(self, warrior, data={}, **kwargs):
         self.warrior = warrior
-        self._load_data(data)
+
+        # We keep data for backwards compatibility
+        kwargs.update(data)
+
+        self._load_data(kwargs)
         self._modified_fields = set()
 
     def __unicode__(self):
@@ -144,13 +153,13 @@ class Task(TaskResource):
 
     def delete(self):
         if not self.saved:
-            raise self.NotSaved("Task needs to be saved before it can be deleted")
+            raise Task.NotSaved("Task needs to be saved before it can be deleted")
 
         # Refresh the status, and raise exception if the task is deleted
         self.refresh(only_fields=['status'])
 
         if self.deleted:
-            raise self.DeletedTask("Task was already deleted")
+            raise Task.DeletedTask("Task was already deleted")
 
         self.warrior.execute_command([self['uuid'], 'delete'], config_override={
             'confirmation': 'no',
@@ -162,15 +171,15 @@ class Task(TaskResource):
 
     def done(self):
         if not self.saved:
-            raise self.NotSaved("Task needs to be saved before it can be completed")
+            raise Task.NotSaved("Task needs to be saved before it can be completed")
 
         # Refresh, and raise exception if task is already completed/deleted
         self.refresh(only_fields=['status'])
 
         if self.completed:
-            raise self.CompletedTask("Cannot complete a completed task")
+            raise Task.CompletedTask("Cannot complete a completed task")
         elif self.deleted:
-            raise self.DeletedTask("Deleted task cannot be completed")
+            raise Task.DeletedTask("Deleted task cannot be completed")
 
         self.warrior.execute_command([self['uuid'], 'done'])
 
@@ -200,7 +209,7 @@ class Task(TaskResource):
 
     def add_annotation(self, annotation):
         if not self.saved:
-            raise self.NotSaved("Task needs to be saved to add annotation")
+            raise Task.NotSaved("Task needs to be saved to add annotation")
 
         args = [self['uuid'], 'annotate', annotation]
         self.warrior.execute_command(args)
@@ -208,7 +217,7 @@ class Task(TaskResource):
 
     def remove_annotation(self, annotation):
         if not self.saved:
-            raise self.NotSaved("Task needs to be saved to add annotation")
+            raise Task.NotSaved("Task needs to be saved to add annotation")
 
         if isinstance(annotation, TaskAnnotation):
             annotation = annotation['description']
@@ -235,7 +244,7 @@ class Task(TaskResource):
     def refresh(self, only_fields=[]):
         # Raise error when trying to refresh a task that has not been saved
         if not self.saved:
-            raise self.NotSaved("Task needs to be saved to be refreshed")
+            raise Task.NotSaved("Task needs to be saved to be refreshed")
 
         # We need to use ID as backup for uuid here for the refreshes
         # of newly saved tasks. Any other place in the code is fine
@@ -397,6 +406,7 @@ class TaskWarrior(object):
             'data.location': os.path.expanduser(data_location),
         }
         self.tasks = TaskQuerySet(self)
+        self.version = self._get_version()
 
     def _get_command_args(self, args, config_override={}):
         command_args = ['task', 'rc:/']
@@ -407,6 +417,14 @@ class TaskWarrior(object):
         command_args.extend(map(str, args))
         return command_args
 
+    def _get_version(self):
+        p = subprocess.Popen(
+                ['task', '--version'],
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE)
+        stdout, stderr = [x.decode('utf-8') for x in p.communicate()]
+        return stdout.strip('\n')
+
     def execute_command(self, args, config_override={}):
         command_args = self._get_command_args(
             args, config_override=config_override)