From: Rob Golding Date: Thu, 15 Jan 2015 13:40:47 +0000 (+0000) Subject: Merge branch 'develop' into deserialized-data-dict X-Git-Url: https://git.madduck.net/etc/taskwarrior.git/commitdiff_plain/d4ee441b2352dd50f00363c1ccb123e25cbac248?hp=c847950d26f7dbef22c998c17f7457b2cbb3c3ea Merge branch 'develop' into deserialized-data-dict Conflicts: tasklib/task.py --- diff --git a/README.rst b/README.rst index ff25287..b3dce21 100644 --- a/README.rst +++ b/README.rst @@ -1,7 +1,7 @@ tasklib ======= -.. image:: https://travis-ci.org/robgolding63/tasklib.png +.. image:: https://travis-ci.org/robgolding63/tasklib.png?branch=develop :target: http://travis-ci.org/robgolding63/tasklib .. image:: https://coveralls.io/repos/robgolding63/tasklib/badge.png?branch=develop diff --git a/docs/conf.py b/docs/conf.py index 650efc9..e83a5e3 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -51,9 +51,9 @@ copyright = u'2014, Rob Golding' # built documents. # # The short X.Y version. -version = '0.7.0' +version = '0.7.1' # The full version, including alpha/beta/rc tags. -release = '0.7.0' +release = '0.7.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/setup.py b/setup.py index 92f8e85..64018ea 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ from setuptools import setup, find_packages -version = '0.7.0' +version = '0.7.1' setup( name='tasklib', diff --git a/tasklib/task.py b/tasklib/task.py index a739d25..8513b14 100644 --- a/tasklib/task.py +++ b/tasklib/task.py @@ -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())