travis: Speed up and support testing with libshared-dependant builds

[etc/taskwarrior.git] / tasklib / backends.py

diff --git a/tasklib/backends.py b/tasklib/backends.py
index 4b0c6df36221f7681cba68188158218707406dc2..e6daace5064bc275d1be93308138cf160804187b 100644 (file)
--- 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))
         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):
         return command_args
 
     def _get_version(self):