From: gabriel pettier Date: Sun, 9 Aug 2015 01:10:40 +0000 (+0200) Subject: pep8/flake8 fixes X-Git-Url: https://git.madduck.net/etc/taskwarrior.git/commitdiff_plain/a8a458c71b1a1f6e23fb734da35c349b14f5c462?ds=inline;hp=--cc pep8/flake8 fixes --- a8a458c71b1a1f6e23fb734da35c349b14f5c462 diff --git a/tasklib/backends.py b/tasklib/backends.py index 6c19b48..00b2210 100644 --- a/tasklib/backends.py +++ b/tasklib/backends.py @@ -16,6 +16,7 @@ DATE_FORMAT_CALC = '%Y-%m-%dT%H:%M:%S' logger = logging.getLogger(__name__) + class Backend(object): @abc.abstractproperty @@ -135,9 +136,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 +155,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 +194,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 +230,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[^\s]+)\s+(?P[^\s].+$)') @@ -381,14 +383,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 c177984..767f7df 100644 --- 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 c821fcc..c40a3c7 100644 --- 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.