X-Git-Url: https://git.madduck.net/etc/taskwarrior.git/blobdiff_plain/516b8d6c03058552cfe7c3bfda4362640a3077e1..0e45c41ab8685abd3d1954912d8bd6f8fdf6637a:/tasklib/backends.py?ds=sidebyside

diff --git a/tasklib/backends.py b/tasklib/backends.py
index 4b0c6df..1e1b8c4 100644
--- a/tasklib/backends.py
+++ b/tasklib/backends.py
@@ -132,7 +132,10 @@ class TaskWarrior(Backend):
         overrides.update(config_override or dict())
         for item in overrides.items():
             command_args.append('rc.{0}={1}'.format(*item))
-        command_args.extend([x.decode('utf-8') for x in args])
+        command_args.extend([
+            x.decode('utf-8') if isinstance(x, six.binary_type)
+            else six.text_type(x) for x in args
+        ])
         return command_args
 
     def _get_version(self):
@@ -248,7 +251,7 @@ class TaskWarrior(Backend):
         )
 
         config = dict()
-        config_regex = re.compile(r'^(?P<key>[^\s]+)\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)