]> git.madduck.net Git - etc/taskwarrior.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Merge branch 'develop' into deserialized-data-dict
authorRob Golding <rob@robgolding.com>
Thu, 15 Jan 2015 13:40:47 +0000 (13:40 +0000)
committerRob Golding <rob@robgolding.com>
Thu, 15 Jan 2015 13:40:47 +0000 (13:40 +0000)
Conflicts:
tasklib/task.py

1  2 
tasklib/task.py

diff --cc tasklib/task.py
index a739d25b46e2ebcc6137a7300fcb7bd1bc2618a9,b6c3d09168ec6897749ade2c2d4ce26ceebf2b33..8513b14f79cdebbd200bda6be3fc199a2946ef6a
@@@ -369,11 -372,13 +369,14 @@@ class Task(TaskResource)
  
          def add_field(field):
              # Add the output of format_field method to args list (defaults to
 -            # field:'value')
 -            format_default = lambda k: "{0}:{1}".format(k,
 -                                           "'{0}'".format(self._data[k])
 -                                           if self._data[k] is not None
 -                                           else '')
 +            # 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),
 -                                  lambda: format_default(field))
 +                                  format_default)
              args.append(format_func())
  
          # If we're modifying saved task, simply pass on all modified fields