X-Git-Url: https://git.madduck.net/etc/taskwarrior.git/blobdiff_plain/34f4f216b22b3cc778721807b206ecf940fe8cfe..bf31f5229458f9b7fd1fd8800436f55393d13a52:/tasklib/task.py?ds=sidebyside

diff --git a/tasklib/task.py b/tasklib/task.py
index 0546e44..9246e1f 100644
--- a/tasklib/task.py
+++ b/tasklib/task.py
@@ -230,7 +230,7 @@ class TaskQuerySet(object):
 class TaskWarrior(object):
     def __init__(self, data_location='~/.task', create=True):
         data_location = os.path.expanduser(data_location)
-        if not os.path.exists(data_location):
+        if create and not os.path.exists(data_location):
             os.makedirs(data_location)
         self.config = {
             'data.location': os.path.expanduser(data_location),
@@ -252,7 +252,7 @@ class TaskWarrior(object):
         logger.debug(' '.join(command_args))
         p = subprocess.Popen(command_args, stdout=subprocess.PIPE,
                              stderr=subprocess.PIPE)
-        stdout, stderr = p.communicate()
+        stdout, stderr = [x.decode() for x in p.communicate()]
         if p.returncode:
             if stderr.strip():
                 error_msg = stderr.strip().splitlines()[-1]
@@ -266,7 +266,11 @@ class TaskWarrior(object):
         tasks = []
         for line in self.execute_command(args):
             if line:
-                tasks.append(Task(self, json.loads(line.strip(','))))
+                data = line.strip(',')
+                try:
+                    tasks.append(Task(self, json.loads(data)))
+                except ValueError:
+                    raise TaskWarriorException('Invalid JSON: %s' % data)
         return tasks
 
     def merge_with(self, path, push=False):