Use six.string_types over basestring for Python 3 compatibility

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

diff --git a/tasklib/task.py b/tasklib/task.py
index a739d25b46e2ebcc6137a7300fcb7bd1bc2618a9..9d6d47f4a8bcf6c0951514d9c0a78f6056182ed7 100644 (file)
--- a/tasklib/task.py
+++ b/tasklib/task.py
@@ -93,7 +93,7 @@ class SerializingObject(object):
         return ','.join(tags) if tags else ''
 
     def deserialize_tags(self, tags):
-        if isinstance(tags, basestring):
+        if isinstance(tags, six.string_types):
             return tags.split(',') if tags else []
         return tags or []
 
@@ -371,7 +371,10 @@ class Task(TaskResource):
             # Add the output of format_field method to args list (defaults to
             # field:value)
             serialized_value = self._serialize(field, self._data[field]) or ''
-            format_default = lambda: "{0}:'{1}'".format(field, serialized_value)
+            format_default = lambda: "{0}:{1}".format(
+                field,
+                "'{0}'".format(serialized_value) if serialized_value else ''
+            )
             format_func = getattr(self, 'format_{0}'.format(field),
                                   format_default)
             args.append(format_func())