Merge branch 'develop' into deserialized-data-dict

Conflicts:
	tasklib/task.py

diff --git a/README.rst b/README.rst
index ff25287dc08ad5ab280aa93eade6013f0ef6fc45..b3dce21d45f03c91605e6c999b03bfb02143e6a2 100644 (file)
--- 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 650efc95ec4b88f07569121a37df03f6a35b660c..e83a5e37194a049a22e43ad37b5ccca086b3011b 100644 (file)
--- 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 92f8e85a7d752a0f86aa27cdecec54330b7fa391..64018ea200310d0b654e307b92c59e2f38bec521 100644 (file)
--- 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 a739d25b46e2ebcc6137a7300fcb7bd1bc2618a9..8513b14f79cdebbd200bda6be3fc199a2946ef6a 100644 (file)
--- 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())