X-Git-Url: https://git.madduck.net/etc/taskwarrior.git/blobdiff_plain/f986b814683ddee836b534f344bca017ac697c58..d850c6c05a3ae1e09a597b03d6459b594e0958da:/tasklib/filters.py diff --git a/tasklib/filters.py b/tasklib/filters.py index 7b44e98..b7cab64 100644 --- a/tasklib/filters.py +++ b/tasklib/filters.py @@ -1,5 +1,6 @@ import abc -from tasklib.serializing import SerializingObject +import six +from .serializing import SerializingObject class TaskFilter(object): @@ -34,9 +35,9 @@ class TaskWarriorFilter(TaskFilter, SerializingObject): A set of parameters to filter the task list with. """ - def __init__(self, warrior, filter_params=None): + def __init__(self, backend, filter_params=None): self.filter_params = filter_params or [] - super(TaskFilter, self).__init__(warrior) + super(TaskFilter, self).__init__(backend) def add_filter(self, filter_str): self.filter_params.append(filter_str) @@ -63,7 +64,7 @@ class TaskWarriorFilter(TaskFilter, SerializingObject): # We enforce equality match by using 'is' (or 'none') modifier # Without using this syntax, filter fails due to TW-1479 # which is, however, fixed in 2.4.5 - if self.warrior.version < VERSION_2_4_5: + if self.backend.version < self.backend.VERSION_2_4_5: modifier = '.is' if value else '.none' key = key + modifier if '.' not in key else key @@ -73,6 +74,6 @@ class TaskWarriorFilter(TaskFilter, SerializingObject): return [f for f in self.filter_params if f] def clone(self): - c = self.__class__(self.warrior) + c = self.__class__(self.backend) c.filter_params = list(self.filter_params) return c