Fix #2 -- correctly deal with unicode data

diff --git a/setup.py b/setup.py
index 3546c3ba73e420561f87547e1116e39b76d12cb9..a70cfd4cc6968383087d6a2a2700c2557ab408fd 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -15,6 +15,7 @@ setup(
     packages=find_packages(),
     include_package_data=True,
     test_suite='tasklib.tests',
     packages=find_packages(),
     include_package_data=True,
     test_suite='tasklib.tests',

+    install_requires=['six==1.5.2'],

     classifiers=[
         'Development Status :: 4 - Beta',
         'Programming Language :: Python',
     classifiers=[
         'Development Status :: 4 - Beta',
         'Programming Language :: Python',

diff --git a/tasklib/task.py b/tasklib/task.py
index de0443caef2ad4732aafdbca31d393e860ac44ad..6fbce776d658bef73b250983d86042273cb28e57 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,11 @@ 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 __repr__(self):
-        return self.__unicode__()
+    def __str__(self):
+        s = six.text_type(self.__unicode__())
+        if not six.PY3:
+            s = s.encode('utf-8')
+        return s

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


@@ -297,7 +302,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]