pep8/flake8 fixes

[etc/taskwarrior.git] / tasklib / backends.py

diff --git a/tasklib/backends.py b/tasklib/backends.py
index adfb9a460955f45bb037ee5bdfac1730ab7ec158..32a8018acb142ddb1257e0fe3916089bde2ecf70 100644 (file)
--- a/tasklib/backends.py
+++ b/tasklib/backends.py
@@ -1,4 +1,5 @@
 import abc
 import abc

+import copy

 import datetime
 import json
 import logging
 import datetime
 import json
 import logging


@@ -6,6 +7,7 @@ import os
 import re
 import six
 import subprocess
 import re
 import six
 import subprocess

+import copy

 
 from .task import Task, TaskQuerySet
 from .filters import TaskWarriorFilter
 
 from .task import Task, TaskQuerySet
 from .filters import TaskWarriorFilter


@@ -15,6 +17,7 @@ DATE_FORMAT_CALC = '%Y-%m-%dT%H:%M:%S'
 
 logger = logging.getLogger(__name__)
 
 
 logger = logging.getLogger(__name__)
 

+

 class Backend(object):
 
     @abc.abstractproperty
 class Backend(object):
 
     @abc.abstractproperty


@@ -80,7 +83,7 @@ class TaskWarriorException(Exception):
     pass
 
 
     pass
 
 

-class TaskWarrior(object):
+class TaskWarrior(Backend):

 
     VERSION_2_1_0 = six.u('2.1.0')
     VERSION_2_2_0 = six.u('2.2.0')
 
     VERSION_2_1_0 = six.u('2.1.0')
     VERSION_2_2_0 = six.u('2.2.0')


@@ -134,9 +137,9 @@ class TaskWarrior(object):
 
     def _get_version(self):
         p = subprocess.Popen(
 
     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')
 
         stdout, stderr = [x.decode('utf-8') for x in p.communicate()]
         return stdout.strip('\n')
 


@@ -153,10 +156,11 @@ class TaskWarrior(object):
             if serialized_value is '':
                 escaped_serialized_value = ''
             else:
             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: 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)
 
             format_func = getattr(self, 'format_{0}'.format(field),
                                   format_default)


@@ -186,14 +190,14 @@ class TaskWarrior(object):
 
         old_dependencies = task._original_data.get('depends', set())
 
 
         old_dependencies = task._original_data.get('depends', set())
 

-        added = self['depends'] - old_dependencies
-        removed = old_dependencies - self['depends']
+        added = task['depends'] - old_dependencies
+        removed = old_dependencies - task['depends']

 
         # Removed dependencies need to be prefixed with '-'
         return 'depends:' + ','.join(
 
         # 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
 
     def format_description(self, task):
         # Task version older than 2.4.0 ignores first word of the


@@ -217,6 +221,8 @@ class TaskWarrior(object):
                              "datetime, its type is not supported: {}"
                              .format(type(value)))
 
                              "datetime, its type is not supported: {}"
                              .format(type(value)))
 

+        return localized
+

     @property
     def filter_class(self):
         return TaskWarriorFilter
     @property
     def filter_class(self):
         return TaskWarriorFilter


@@ -225,9 +231,9 @@ class TaskWarrior(object):
 
     def get_config(self):
         raw_output = self.execute_command(
 
     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].+$)')
 
         config = dict()
         config_regex = re.compile(r'^(?P<key>[^\s]+)\s+(?P<value>[^\s].+$)')


@@ -378,14 +384,14 @@ class TaskWarrior(object):
                 taskfilter.add_filter_param(key, value)
 
             output = self.execute_command(['export', '--'] +
                 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(
 
         # 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])
             )
 
         return json.loads(output[0])