TaskFilter: Rename TaskFilter to TaskWarriorFilter

diff --git a/tasklib/backends.py b/tasklib/backends.py
index 02d412c1ed491ca6c911bc2a40d3335628883b0f..51285b544b8e31fd148b3f1ce3ff133f085fa6cd 100644 (file)
--- a/tasklib/backends.py
+++ b/tasklib/backends.py
@@ -4,7 +4,7 @@ import os
 import re
 import subprocess
 
 import re
 import subprocess
 

-from tasklib.task import TaskFilter
+from tasklib.filters import TaskWarriorFilter

 
 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')


@@ -19,7 +19,7 @@ VERSION_2_4_5 = six.u('2.4.5')
 
 class Backend(object):
 
 
 class Backend(object):
 

-    filter_class = TaskFilter
+    filter_class = TaskWarriorFilter

 
     @abc.abstractmethod
     def filter_tasks(self, filter_obj):
 
     @abc.abstractmethod
     def filter_tasks(self, filter_obj):

diff --git a/tasklib/filters.py b/tasklib/filters.py
index 1899d1d568831f3f4ae5edefb71cd73467e1b60c..211302fc70cb124f3ad525b22195d331ffa19b4c 100644 (file)
--- a/tasklib/filters.py
+++ b/tasklib/filters.py
@@ -1,7 +1,7 @@
 from tasklib.serializing import SerializingObject
 
 
 from tasklib.serializing import SerializingObject
 
 

-class TaskFilter(SerializingObject):
+class TaskWarriorFilter(SerializingObject):

     """
     A set of parameters to filter the task list with.
     """
     """
     A set of parameters to filter the task list with.
     """

diff --git a/tasklib/task.py b/tasklib/task.py
index 614fd56bb4a211423118a26af4aa825517a56050..d39c10c24387bbe6a1de5feed397779c34aba32f 100644 (file)
--- a/tasklib/task.py
+++ b/tasklib/task.py
@@ -54,7 +54,7 @@ class ReadOnlyDictView(object):
 
 class SerializingObject(object):
     """
 
 class SerializingObject(object):
     """

-    Common ancestor for TaskResource & TaskFilter, since they both
+    Common ancestor for TaskResource & TaskWarriorFilter, since they both

     need to serialize arguments.
 
     Serializing method should hold the following contract:
     need to serialize arguments.
 
     Serializing method should hold the following contract:


@@ -661,7 +661,7 @@ class TaskQuerySet(object):
     def __init__(self, warrior=None, filter_obj=None):
         self.warrior = warrior
         self._result_cache = None
     def __init__(self, warrior=None, filter_obj=None):
         self.warrior = warrior
         self._result_cache = None

-        self.filter_obj = filter_obj or TaskFilter(warrior)
+        self.filter_obj = filter_obj or TaskWarriorFilter(warrior)

 
     def __deepcopy__(self, memo):
         """
 
     def __deepcopy__(self, memo):
         """