--- a/eric6/Tasks/TaskFilter.py Sat May 01 18:48:35 2021 +0200 +++ b/eric6/Tasks/TaskFilter.py Sat May 01 20:28:00 2021 +0200 @@ -10,7 +10,7 @@ import fnmatch import re -from .Task import Task +from .Task import TaskType class TaskFilter: @@ -25,7 +25,7 @@ self.summaryFilter = None self.filenameFilter = "" - self.typeFilter = Task.TypeNone + self.typeFilter = TaskType.NONE # task type self.scopeFilter = None @@ -70,8 +70,8 @@ """ Public method to set the type filter. - @param taskType type of the task (one of Task.TypeNone, Task.TypeFixme, - Task.TypeTodo, Task.TypeWarning, Task.TypeNote) + @param taskType type of the task + @type TaskType """ self.typeFilter = taskType @@ -108,7 +108,7 @@ return ( self.summaryFilter is not None or bool(self.filenameFilter) or - self.typeFilter != Task.TypeNone or + self.typeFilter != TaskType.NONE or self.scopeFilter is not None or self.statusFilter is not None or self.prioritiesFilter is not None @@ -137,7 +137,7 @@ return False if ( - self.typeFilter != Task.TypeNone and + self.typeFilter != TaskType.NONE and self.typeFilter != task.taskType ): return False