No need to rename filter.apply

gramps/gen/filters/_genericfilter.py

@@ -328,7 +328,7 @@ def apply_to_one(self, db, data):
             raise Exception("invalid operator: %r" % self.logical_op)
         return res != self.invert
 
-    def apply_to_all(self, db, id_list=None, tupleind=None, user=None, tree=False):
+    def apply(self, db, id_list=None, tupleind=None, user=None, tree=False):
         """
         Apply the filter using db.
         If id_list given, the handles in id_list are used. If not given

gramps/gen/filters/_paramfilter.py

@@ -45,7 +45,7 @@ def __init__(self, source=None):
     def set_parameter(self, param):
         self.param_list = [param]
 
-    def apply_to_all(self, db, id_list=None, user=None):
+    def apply(self, db, id_list=None, user=None):
         for rule in self.flist:
             # rule.set_list(self.param_list)
             #
@@ -62,7 +62,7 @@ def apply_to_all(self, db, id_list=None, user=None):
                     "Custom filters can not twice be used" " in a parameter filter"
                 )
             rule.requestprepare(db, user)
-        result = GenericFilter.apply_to_all(self, db, id_list)
+        result = GenericFilter.apply(self, db, id_list)
         for rule in self.flist:
             rule.requestreset()
         return result

gramps/gen/filters/rules/test/event_rules_test.py

@@ -73,7 +73,7 @@ def filter_with_rule(self, rule):
         """
         filter_ = GenericEventFilter()
         filter_.add_rule(rule)
-        results = filter_.apply_to_all(self.db)
+        results = filter_.apply(self.db)
         return set(results)
 
     def test_allevents(self):

gramps/gen/filters/rules/test/family_rules_test.py

@@ -84,7 +84,7 @@ def filter_with_rule(self, rule):
         """
         filter_ = GenericFamilyFilter()
         filter_.add_rule(rule)
-        results = filter_.apply_to_all(self.db)
+        results = filter_.apply(self.db)
         return set(results)
 
     def test_allfamilies(self):

gramps/gen/filters/rules/test/media_rules_test.py

@@ -70,7 +70,7 @@ def filter_with_rule(self, rule):
         """
         filter_ = GenericMediaFilter()
         filter_.add_rule(rule)
-        results = filter_.apply_to_all(self.db)
+        results = filter_.apply(self.db)
         return set(results)
 
     def test_allmedia(self):

gramps/gen/filters/rules/test/note_rules_test.py

@@ -65,7 +65,7 @@ def filter_with_rule(self, rule):
         """
         filter_ = GenericNoteFilter()
         filter_.add_rule(rule)
-        results = filter_.apply_to_all(self.db)
+        results = filter_.apply(self.db)
         return set(results)
 
     def test_allnotes(self):

gramps/gen/filters/rules/test/person_rules_test.py

@@ -147,7 +147,7 @@ def filter_with_rule(
         filter_.set_logical_op(l_op)
         filter_.set_invert(invert)
         stime = perf_counter()
-        results = filter_.apply_to_all(self.db)
+        results = filter_.apply(self.db)
         # if __debug__:
         # frame = inspect.currentframe()
         # rulename = frame.f_back.f_code.co_name

gramps/gen/filters/rules/test/place_rules_test.py

@@ -76,7 +76,7 @@ def filter_with_rule(self, rule):
         """
         filter_ = GenericPlaceFilter()
         filter_.add_rule(rule)
-        results = filter_.apply_to_all(self.db)
+        results = filter_.apply(self.db)
         return set(results)
 
     def test_allplaces(self):

gramps/gen/filters/rules/test/repository_rules_test.py

@@ -64,7 +64,7 @@ def filter_with_rule(self, rule):
         """
         filter_ = GenericRepositoryFilter()
         filter_.add_rule(rule)
-        results = filter_.apply_to_all(self.db)
+        results = filter_.apply(self.db)
         return set(results)
 
     def test_allrepos(self):

gramps/gen/proxy/filter.py

@@ -67,7 +67,7 @@ def __init__(
         self.person_filter = person_filter
         if person_filter:
             self.plist = set(
-                person_filter.apply_to_all(
+                person_filter.apply(
                     self.db, self.db.iter_person_handles(), user=user
                 )
             )
@@ -76,7 +76,7 @@ def __init__(
 
         if event_filter:
             self.elist = set(
-                event_filter.apply_to_all(
+                event_filter.apply(
                     self.db, self.db.iter_event_handles(), user=user
                 )
             )
@@ -85,7 +85,7 @@ def __init__(
 
         if note_filter:
             self.nlist = set(
-                note_filter.apply_to_all(
+                note_filter.apply(
                     self.db, self.db.iter_note_handles(), user=user
                 )
             )

gramps/gui/editors/filtereditor.py

@@ -1312,7 +1312,7 @@ def test_clicked(self, obj):
         if node:
             filt = self.clist.get_object(node)
             try:
-                handle_list = filt.apply_to_all(self.db, self.get_all_handles())
+                handle_list = filt.apply(self.db, self.get_all_handles())
             except FilterError as msg:
                 (msg1, msg2) = msg.messages()
                 ErrorDialog(msg1, msg2, parent=self.window)

gramps/gui/views/treemodels/flatbasemodel.py

@@ -627,11 +627,11 @@ def _rebuild_filter(self, ignore=None):
             if self.search:
                 ident = False
                 if ignore is None:
-                    dlist = self.search.apply_to_all(
+                    dlist = self.search.apply(
                         cdb, allkeys, tupleind=1, user=self.user
                     )
                 else:
-                    dlist = self.search.apply_to_all(
+                    dlist = self.search.apply(
                         cdb, [k for k in allkeys if k[1] != ignore], tupleind=1
                     )
             elif ignore is None:

gramps/gui/views/treemodels/treebasemodel.py

@@ -623,7 +623,7 @@ def __rebuild_filter(self, dfilter, skip, items, gen_cursor, data_map, add_func)
         assert not skip
         if dfilter:
             cdb = CacheProxyDb(self.db)
-            for handle in dfilter.apply_to_all(
+            for handle in dfilter.apply(
                 cdb,
                 tree=True,
                 user=User(parent=self.uistate.window, uistate=self.uistate),

gramps/plugins/drawreport/calendarreport.py

@@ -351,7 +351,7 @@ def collect_data(self):
         and text.
         """
         people = self.database.iter_person_handles()
-        people = self.filter.apply_to_all(self.database, people, user=self._user)
+        people = self.filter.apply(self.database, people, user=self._user)
 
         with self._user.progress(
             _("Calendar Report"), _("Reading database..."), len(people)

gramps/plugins/drawreport/statisticschart.py

@@ -907,7 +907,7 @@ def __init__(self, database, options, user):
             self._get_date(Date(year_to)),
         )
 
-        people = self.filter.apply_to_all(
+        people = self.filter.apply(
             self.database, self.database.iter_person_handles(), user=self._user
         )
 

gramps/plugins/drawreport/timeline.py

@@ -142,7 +142,7 @@ def __init__(self, database, options, user):
 
     def write_report(self):
         # Apply the filter
-        self.plist = self.filter.apply_to_all(
+        self.plist = self.filter.apply(
             self.database, self.database.iter_person_handles(), user=self._user
         )
 
@@ -385,7 +385,7 @@ def min_max_year(low, high, year):
 
     def name_size(self):
         """get the length of the name"""
-        self.plist = self.filter.apply_to_all(
+        self.plist = self.filter.apply(
             self.database, self.database.iter_person_handles(), user=self._user
         )
 

gramps/plugins/gramplet/todogramplet.py

@@ -104,7 +104,7 @@ def get_note_list(self):
         FilterClass = GenericFilterFactory("Note")
         filter = FilterClass()
         filter.add_rule(rules.note.HasType(["To Do"]))
-        note_list = filter.apply_to_all(self.dbstate.db, all_notes)
+        note_list = filter.apply(self.dbstate.db, all_notes)
         return note_list
 
     def get_notes(self):

gramps/plugins/graph/gvrelgraph.py

@@ -211,7 +211,7 @@ def __init__(self, database, options, user):
             self.advrelinfo = False
 
     def write_report(self):
-        person_handles = self._filter.apply_to_all(
+        person_handles = self._filter.apply(
             self._db, self._db.iter_person_handles(), user=self._user
         )
         # Hash people in a dictionary for faster inclusion checking

gramps/plugins/lib/librecords.py

@@ -169,7 +169,7 @@ def get_unfiltered_person_from_handle(person_handle):
     person_handle_list = list(person_handle_list)
 
     if filter:
-        person_handle_list = filter.apply_to_all(db, person_handle_list, user=user)
+        person_handle_list = filter.apply(db, person_handle_list, user=user)
 
     for person_handle in person_handle_list:
         person = db.get_person_from_handle(person_handle)
@@ -387,7 +387,7 @@ def get_unfiltered_person_from_handle(person_handle):
         if filter:
             # we don't want many progress reports popping up, so no user=user
             # FIXME:
-            if not filter.apply_to_all(db, [father_handle, mother_handle]):
+            if not filter.apply(db, [father_handle, mother_handle]):
                 continue
 
         father = db.get_person_from_handle(father_handle)

gramps/plugins/quickview/samesurnames.py

@@ -133,7 +133,7 @@ def run(database, document, person):
     else:
         rule = IncompleteSurname([])
     filter.add_rule(rule)
-    people = filter.apply_to_all(database, database.iter_person_handles())
+    people = filter.apply(database, database.iter_person_handles())
 
     matches = 0
     for person_handle in people:
@@ -183,7 +183,7 @@ def run_given(database, document, person):
     else:
         rule = IncompleteGiven([])
     filter.add_rule(rule)
-    people = filter.apply_to_all(database, database.iter_person_handles())
+    people = filter.apply(database, database.iter_person_handles())
 
     matches = 0
     for person_handle in people:

gramps/plugins/textreport/birthdayreport.py

@@ -291,7 +291,7 @@ def collect_data(self):
         and text.
         """
         people = self.database.iter_person_handles()
-        people = self.filter.apply_to_all(self.database, people, user=self._user)
+        people = self.filter.apply(self.database, people, user=self._user)
 
         ngettext = self._locale.translation.ngettext  # to see "nearby" comments
         rel_calc = get_relationship_calculator(reinit=True, clocale=self._locale)

gramps/plugins/textreport/familygroup.py

@@ -677,7 +677,7 @@ def write_report(self):
         if not self.filter:
             fam_list = flist
         else:
-            fam_list = self.filter.apply_to_all(self.db, flist, user=self._user)
+            fam_list = self.filter.apply(self.db, flist, user=self._user)
         if fam_list:
             with self._user.progress(
                 _("Family Group Report"), _("Writing families"), len(fam_list)

gramps/plugins/textreport/indivcomplete.py

@@ -850,7 +850,7 @@ def write_report(self):
         """write the report"""
         plist = self._db.get_person_handles(sort_handles=True, locale=self._locale)
         if self.filter:
-            ind_list = self.filter.apply_to_all(self._db, plist, user=self._user)
+            ind_list = self.filter.apply(self._db, plist, user=self._user)
         else:
             ind_list = plist
         if not ind_list:

gramps/plugins/textreport/placereport.py

@@ -125,7 +125,7 @@ def __init__(self, database, options, user):
         if self.filter.get_name() != "":
             # Use the selected filter to provide a list of place handles
             plist = self._db.iter_place_handles()
-            self.place_handles = self.filter.apply_to_all(
+            self.place_handles = self.filter.apply(
                 self._db, plist, user=self._user
             )
 

gramps/plugins/textreport/tagreport.py

@@ -147,7 +147,7 @@ def write_people(self):
         filter_class = GenericFilterFactory("Person")
         a_filter = filter_class()
         a_filter.add_rule(rules.person.HasTag([self.tag]))
-        ind_list = a_filter.apply_to_all(self.database, plist)
+        ind_list = a_filter.apply(self.database, plist)
 
         if not ind_list:
             return
@@ -235,7 +235,7 @@ def write_families(self):
         filter_class = GenericFilterFactory("Family")
         a_filter = filter_class()
         a_filter.add_rule(rules.family.HasTag([self.tag]))
-        fam_list = a_filter.apply_to_all(self.database, flist)
+        fam_list = a_filter.apply(self.database, flist)
 
         if not fam_list:
             return
@@ -324,7 +324,7 @@ def write_events(self):
         filter_class = GenericFilterFactory("Event")
         a_filter = filter_class()
         a_filter.add_rule(rules.event.HasTag([self.tag]))
-        event_list = a_filter.apply_to_all(self.database, elist)
+        event_list = a_filter.apply(self.database, elist)
 
         if not event_list:
             return
@@ -406,7 +406,7 @@ def write_places(self):
         filter_class = GenericFilterFactory("Place")
         a_filter = filter_class()
         a_filter.add_rule(rules.place.HasTag([self.tag]))
-        place_list = a_filter.apply_to_all(self.database, plist)
+        place_list = a_filter.apply(self.database, plist)
 
         if not place_list:
             return
@@ -487,7 +487,7 @@ def write_notes(self):
         filter_class = GenericFilterFactory("Note")
         a_filter = filter_class()
         a_filter.add_rule(rules.note.HasTag([self.tag]))
-        note_list = a_filter.apply_to_all(self.database, nlist)
+        note_list = a_filter.apply(self.database, nlist)
 
         if not note_list:
             return
@@ -559,7 +559,7 @@ def write_media(self):
         filter_class = GenericFilterFactory("Media")
         a_filter = filter_class()
         a_filter.add_rule(rules.media.HasTag([self.tag]))
-        media_list = a_filter.apply_to_all(self.database, mlist)
+        media_list = a_filter.apply(self.database, mlist)
 
         if not media_list:
             return
@@ -643,7 +643,7 @@ def write_repositories(self):
         filter_class = GenericFilterFactory("Repository")
         a_filter = filter_class()
         a_filter.add_rule(rules.repository.HasTag([self.tag]))
-        repo_list = a_filter.apply_to_all(self.database, rlist)
+        repo_list = a_filter.apply(self.database, rlist)
 
         if not repo_list:
             return
@@ -728,7 +728,7 @@ def write_sources(self):
         filter_class = GenericFilterFactory("Source")
         a_filter = filter_class()
         a_filter.add_rule(rules.source.HasTag([self.tag]))
-        source_list = a_filter.apply_to_all(self.database, slist)
+        source_list = a_filter.apply(self.database, slist)
 
         if not source_list:
             return
@@ -810,7 +810,7 @@ def write_citations(self):
         filter_class = GenericFilterFactory("Citation")
         a_filter = filter_class()
         a_filter.add_rule(rules.citation.HasTag([self.tag]))
-        citation_list = a_filter.apply_to_all(self.database, clist)
+        citation_list = a_filter.apply(self.database, clist)
 
         if not citation_list:
             return

gramps/plugins/tool/eventcmp.py

@@ -184,7 +184,7 @@ def on_apply_clicked(self, obj):
         progress_bar = ProgressMeter(_("Comparing events"), "", parent=self.window)
         progress_bar.set_pass(_("Selecting people"), 1)
 
-        plist = cfilter.apply_to_all(self.db, self.db.iter_person_handles())
+        plist = cfilter.apply(self.db, self.db.iter_person_handles())
 
         progress_bar.step()
         progress_bar.close()

gramps/plugins/tool/removeunused.py

@@ -305,10 +305,10 @@ def collect_unused(self):
         FilterClass = GenericFilterFactory("Note")
         filter1 = FilterClass()
         filter1.add_rule(rules.note.HasType(["To Do"]))
-        todo_list = filter1.apply_to_all(self.dbstate.db, all_notes)
+        todo_list = filter1.apply(self.dbstate.db, all_notes)
         filter2 = FilterClass()
         filter2.add_rule(rules.note.HasType(["Link"]))
-        link_list = filter2.apply_to_all(self.dbstate.db, all_notes)
+        link_list = filter2.apply(self.dbstate.db, all_notes)
 
         for the_type, cursor_func, total_func in tables:
             if not self.options.handler.options_dict[the_type]:

gramps/plugins/tool/sortevents.py

@@ -115,7 +115,7 @@ def sort_person_events(self, trans):
         """
         Sort the personal events associated with the selected people.
         """
-        people_handles = self.filter.apply_to_all(
+        people_handles = self.filter.apply(
             self.db, self.db.iter_person_handles(), user=self._user
         )
         self.progress.set_pass(

gramps/plugins/view/geoevents.py

@@ -371,7 +371,7 @@ def _createmap(self, obj):
             progress.close()
         elif self.generic_filter:
             user = self.uistate.viewmanager.user
-            events_list = self.generic_filter.apply_to_all(dbstate.db, user=user)
+            events_list = self.generic_filter.apply(dbstate.db, user=user)
             progress = ProgressMeter(
                 self.window_name, can_cancel=False, parent=self.uistate.window
             )