Merge branch 'fixes' of github.com:/tshirtman/tasklib into develop

diff --git a/tasklib/backends.py b/tasklib/backends.py
index 12144f58d50b419c685c25a7b400a1932d75711b..32a8018acb142ddb1257e0fe3916089bde2ecf70 100644 (file)
--- a/tasklib/backends.py
+++ b/tasklib/backends.py
@@ -7,6 +7,7 @@ import os
 import re
 import six
 import subprocess
+import copy
 
 from .task import Task, TaskQuerySet
 from .filters import TaskWarriorFilter
@@ -16,6 +17,7 @@ DATE_FORMAT_CALC = '%Y-%m-%dT%H:%M:%S'
 
 logger = logging.getLogger(__name__)
 
+
 class Backend(object):
 
     @abc.abstractproperty
@@ -135,9 +137,9 @@ class TaskWarrior(Backend):
 
     def _get_version(self):
         p = subprocess.Popen(
-                ['task', '--version'],
-                stdout=subprocess.PIPE,
-                stderr=subprocess.PIPE)
+            ['task', '--version'],
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE)
         stdout, stderr = [x.decode('utf-8') for x in p.communicate()]
         return stdout.strip('\n')
 
@@ -154,10 +156,11 @@ class TaskWarrior(Backend):
             if serialized_value is '':
                 escaped_serialized_value = ''
             else:
-                escaped_serialized_value = six.u("'{0}'").format(serialized_value)
+                escaped_serialized_value = six.u("'{0}'").format(
+                    serialized_value)
 
-            format_default = lambda task: six.u("{0}:{1}").format(field,
-                                                      escaped_serialized_value)
+            format_default = lambda task: six.u("{0}:{1}").format(
+                field, escaped_serialized_value)
 
             format_func = getattr(self, 'format_{0}'.format(field),
                                   format_default)
@@ -192,9 +195,9 @@ class TaskWarrior(Backend):
 
         # Removed dependencies need to be prefixed with '-'
         return 'depends:' + ','.join(
-                [t['uuid'] for t in added] +
-                ['-' + t['uuid'] for t in removed]
-            )
+            [t['uuid'] for t in added] +
+            ['-' + t['uuid'] for t in removed]
+        )
 
     def format_description(self, task):
         # Task version older than 2.4.0 ignores first word of the
@@ -228,9 +231,9 @@ class TaskWarrior(Backend):
 
     def get_config(self):
         raw_output = self.execute_command(
-                ['show'],
-                config_override={'verbose': 'nothing'}
-            )
+            ['show'],
+            config_override={'verbose': 'nothing'}
+        )
 
         config = dict()
         config_regex = re.compile(r'^(?P<key>[^\s]+)\s+(?P<value>[^\s].+$)')
@@ -381,14 +384,14 @@ class TaskWarrior(Backend):
                 taskfilter.add_filter_param(key, value)
 
             output = self.execute_command(['export', '--'] +
-                taskfilter.get_filter_params())
+                                          taskfilter.get_filter_params())
 
         # If more than 1 task has been matched still, raise an exception
         if not valid(output):
             raise TaskWarriorException(
                 "Unique identifiers {0} with description: {1} matches "
                 "multiple tasks: {2}".format(
-                task['uuid'] or task['id'], task['description'], output)
+                    task['uuid'] or task['id'], task['description'], output)
             )
 
         return json.loads(output[0])

diff --git a/tasklib/serializing.py b/tasklib/serializing.py
index c177984356c11a559c823287c5a4a11f7a71ffae..767f7df7cc47f3cb52dfd0f85a084b1af4e0bea5 100644 (file)
--- a/tasklib/serializing.py
+++ b/tasklib/serializing.py
@@ -8,6 +8,7 @@ import tzlocal
 DATE_FORMAT = '%Y%m%dT%H%M%SZ'
 local_zone = tzlocal.get_localzone()
 
+
 class SerializingObject(object):
     """
     Common ancestor for TaskResource & TaskWarriorFilter, since they both
@@ -204,8 +205,10 @@ class SerializingObject(object):
         localized datetime -> localized datetime (no conversion)
         """
 
-        if (isinstance(value, datetime.date)
-            and not isinstance(value, datetime.datetime)):
+        if (
+            isinstance(value, datetime.date)
+            and not isinstance(value, datetime.datetime)
+        ):
             # Convert to local midnight
             value_full = datetime.datetime.combine(value, datetime.time.min)
             localized = local_zone.localize(value_full)
@@ -233,5 +236,3 @@ class SerializingObject(object):
                              "not: {}".format(value))
 
         return value
-
-

diff --git a/tasklib/task.py b/tasklib/task.py
index 8145e2e12701add3cc9dac608d462062993972cf..f30cc617cf9571b4e451b62c713c13094ae6861d 100644 (file)
--- a/tasklib/task.py
+++ b/tasklib/task.py
@@ -1,6 +1,5 @@
 from __future__ import print_function
 import copy
-import datetime
 import importlib
 import json
 import logging
@@ -76,7 +75,6 @@ class TaskResource(SerializingObject):
         if update_original:
             self._original_data = copy.deepcopy(self._data)
 
-
     def __getitem__(self, key):
         # This is a workaround to make TaskResource non-iterable
         # over simple index-based iteration
@@ -121,7 +119,7 @@ class TaskResource(SerializingObject):
         # to pass that to TaskWarrior.
         data_tuples = filter(lambda t: t[1] is not '', data_tuples)
         data = dict(data_tuples)
-        return json.dumps(data, separators=(',',':'))
+        return json.dumps(data, separators=(',', ':'))
 
     @property
     def _modified_fields(self):
@@ -274,7 +272,6 @@ class Task(TaskResource):
             # If the tasks are not saved, compare the actual instances
             return id(self) == id(other)
 
-
     def __hash__(self):
         if self['uuid']:
             # For saved Tasks, just define equality by equality of uuids
@@ -420,6 +417,7 @@ class Task(TaskResource):
         else:
             self._load_data(new_data)
 
+
 class TaskQuerySet(object):
     """
     Represents a lazy lookup for a task objects.