* src/GenericFilters.py: Remove.

* src/Filters: Move filtering to its own package.
	


svn: r6521

src/plugins/TimeLine.py

@@ -46,7 +46,7 @@ import gtk
 from PluginUtils import Report, ReportOptions, ReportUtils, register_report
 pt2cm = ReportUtils.pt2cm
 import BaseDoc
-import GenericFilter
+from Filters import GenericFilter, Rules, CustomFilters
 import Sort
 from QuestionDialog import ErrorDialog
 
@@ -84,7 +84,7 @@ class TimeLine(Report.Report):
 
         filter_num = options_class.get_filter_number()
         filters = options_class.get_report_filters(person)
-        filters.extend(GenericFilter.CustomFilters.get_filters())
+        filters.extend(CustomFilters.get_filters())
         self.filter = filters[filter_num]
 
         self.title = options_class.handler.options_dict['title']
@@ -409,21 +409,21 @@ class TimeLineOptions(ReportOptions.ReportOptions):
             name = 'PERSON'
             gramps_id = ''
 
-        all = GenericFilter.GenericFilter()
+        all = GenericFilter()
         all.set_name(_("Entire Database"))
-        all.add_rule(GenericFilter.Everyone([]))
+        all.add_rule(Rules.Everyone([]))
 
-        des = GenericFilter.GenericFilter()
+        des = GenericFilter()
         des.set_name(_("Descendants of %s") % name)
-        des.add_rule(GenericFilter.IsDescendantOf([gramps_id,1]))
+        des.add_rule(Rules.IsDescendantOf([gramps_id,1]))
 
-        ans = GenericFilter.GenericFilter()
+        ans = GenericFilter()
         ans.set_name(_("Ancestors of %s") % name)
-        ans.add_rule(GenericFilter.IsAncestorOf([gramps_id,1]))
+        ans.add_rule(Rules.IsAncestorOf([gramps_id,1]))
 
-        com = GenericFilter.GenericFilter()
+        com = GenericFilter()
         com.set_name(_("People with common ancestor with %s") % name)
-        com.add_rule(GenericFilter.HasCommonAncestorWith([gramps_id]))
+        com.add_rule(Rules.HasCommonAncestorWith([gramps_id]))
 
         return [all,des,ans,com]