X-Git-Url: https://git.madduck.net/etc/taskwarrior.git/blobdiff_plain/57704ed4307af96a5216711fd9bfdc6e170b4a66..42baab3573bc84a4663c538afb0280787db952f1:/tasklib/task.py

diff --git a/tasklib/task.py b/tasklib/task.py
index 0f8d963..ba95662 100644
--- a/tasklib/task.py
+++ b/tasklib/task.py
@@ -237,8 +237,15 @@ class SerializingObject(object):
         return ','.join(task['uuid'] for task in value)
 
     def deserialize_depends(self, raw_uuids):
-        raw_uuids = raw_uuids or ''  # Convert None to empty string
-        uuids = raw_uuids.split(',')
+        raw_uuids = raw_uuids or []  # Convert None to empty list
+
+        # TW 2.4.4 encodes list of dependencies as a single string
+        if type(raw_uuids) is not list:
+            uuids = raw_uuids.split(',')
+        # TW 2.4.5 and later exports them as a list, no conversion needed
+        else:
+            uuids = raw_uuids
+
         return set(self.warrior.tasks.get(uuid=uuid) for uuid in uuids if uuid)
 
     def datetime_normalizer(self, value):
@@ -919,6 +926,10 @@ class TaskWarrior(object):
             'confirmation': 'no',
             'dependency.confirmation': 'no',  # See TW-1483 or taskrc man page
             'recurrence.confirmation': 'no',  # Necessary for modifying R tasks
+
+            # Defaults to on since 2.4.5, we expect off during parsing
+            'json.array': 'off',
+
             # 2.4.3 onwards supports 0 as infite bulk, otherwise set just
             # arbitrary big number which is likely to be large enough
             'bulk': 0 if self.version >= VERSION_2_4_3 else 100000,
@@ -957,7 +968,7 @@ class TaskWarrior(object):
             )
 
         config = dict()
-        config_regex = re.compile(r'^(?P<key>[_a-z\.]+)\s+(?P<value>[^\s].+$)')
+        config_regex = re.compile(r'^(?P<key>[^\s]+)\s+(?P<value>[^\s].+$)')
 
         for line in raw_output:
             match = config_regex.match(line)