X-Git-Url: https://git.madduck.net/etc/taskwarrior.git/blobdiff_plain/4156a5aba0241d879144e4791d9031a7d97c838a..323193d227912d03332045018cdf07b6fa73d4b3:/tasklib/task.py diff --git a/tasklib/task.py b/tasklib/task.py index de0443c..65679dc 100644 --- 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 six 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) + def __str__(self): + s = six.text_type(self.__unicode__()) + if not six.PY3: + s = s.encode('utf-8') + return s + def __repr__(self): - return self.__unicode__() + return str(self) class TaskAnnotation(TaskResource): @@ -297,7 +305,7 @@ class TaskWarrior(object): 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]