Merge pull request #8 from tbabej/develop

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

diff --git a/tasklib/task.py b/tasklib/task.py
index de0443caef2ad4732aafdbca31d393e860ac44ad..491a3746b33d326e7b40c49a67ce472921dd47aa 100644 (file)
--- a/tasklib/task.py
+++ b/tasklib/task.py
@@ -1,8 +1,10 @@
+from __future__ import print_function

 import copy
 import datetime
 import json
 import logging
 import os
 import copy
 import datetime
 import json
 import logging
 import os

+import six

 import subprocess
 
 DATE_FORMAT = '%Y%m%dT%H%M%SZ'
 import subprocess
 
 DATE_FORMAT = '%Y%m%dT%H%M%SZ'


@@ -36,8 +38,14 @@ class TaskResource(object):
         self._data[key] = dehydrate_func(value)
         self._modified_fields.add(key)
 
         self._data[key] = dehydrate_func(value)
         self._modified_fields.add(key)
 

+    def __str__(self):
+        s = six.text_type(self.__unicode__())
+        if not six.PY3:
+            s = s.encode('utf-8')
+        return s
+

     def __repr__(self):
     def __repr__(self):

-        return self.__unicode__()
+        return str(self)

 
 
 class TaskAnnotation(TaskResource):
 
 
 class TaskAnnotation(TaskResource):


@@ -151,6 +159,10 @@ class TaskFilter(object):
 
     def add_filter_param(self, key, value):
         key = key.replace('__', '.')
 
     def add_filter_param(self, key, value):
         key = key.replace('__', '.')

+
+        # Replace the value with empty string, since that is the
+        # convention in TW for empty values
+        value = value if value is not None else ''

         self.filter_params.append('{0}:{1}'.format(key, value))
 
     def get_filter_params(self):
         self.filter_params.append('{0}:{1}'.format(key, value))
 
     def get_filter_params(self):


@@ -297,7 +309,7 @@ class TaskWarrior(object):
         logger.debug(' '.join(command_args))
         p = subprocess.Popen(command_args, stdout=subprocess.PIPE,
                              stderr=subprocess.PIPE)
         logger.debug(' '.join(command_args))
         p = subprocess.Popen(command_args, stdout=subprocess.PIPE,
                              stderr=subprocess.PIPE)

-        stdout, stderr = [x.decode() for x in p.communicate()]
+        stdout, stderr = [x.decode('utf-8') for x in p.communicate()]

         if p.returncode:
             if stderr.strip():
                 error_msg = stderr.strip().splitlines()[-1]
         if p.returncode:
             if stderr.strip():
                 error_msg = stderr.strip().splitlines()[-1]