]> git.madduck.net Git - etc/taskwarrior.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Raise TaskWarriorException on invalid JSON
authorRob Golding <rob@robgolding.com>
Tue, 5 Nov 2013 17:47:27 +0000 (17:47 +0000)
committerRob Golding <rob@robgolding.com>
Tue, 5 Nov 2013 17:47:27 +0000 (17:47 +0000)
tasklib/task.py

index c267048fb15154a4d7ec3427b018fb228f747aa8..280f961e1c360c31c1a2f44b906f5f5b36c6a34e 100644 (file)
@@ -266,7 +266,11 @@ class TaskWarrior(object):
         tasks = []
         for line in self.execute_command(args):
             if line:
         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):
         return tasks
 
     def merge_with(self, path, push=False):