Implement iter_people_handles methods and begin to use them - second batch of updates

svn: r12774

src/FilterEditor/_FilterEditor.py

@@ -236,7 +236,7 @@ class FilterEditor(ManagedWindow.ManagedWindow):
 
     def get_all_handles(self):
         if self.namespace == 'Person':
-            return self.db.get_person_handles(sort_handles=False)
+            return self.db.iter_person_handles()
         elif self.namespace == 'Family':
             return self.db.get_family_handles()
         elif self.namespace == 'Event':

src/Filters/Rules/Person/_HasCommonAncestorWithFilterMatch.py

@@ -59,7 +59,7 @@ class HasCommonAncestorWithFilterMatch(HasCommonAncestorWith,MatchesFilter):
         filt = MatchesFilter(self.list)
         filt.prepare(db)
         def init(self, h): self.ancestor_cache[h] = 1
-        for handle in db.get_person_handles(sort_handles=False):
+        for handle in db.iter_person_handles(sort_handles=False):
             if (handle not in self.ancestor_cache
                 and filt.apply (db, db.get_person_from_handle(handle))):
                 for_each_ancestor(db,[handle],init,self)

src/Filters/Rules/Person/_IsAncestorOfFilterMatch.py

@@ -67,7 +67,7 @@ class IsAncestorOfFilterMatch(IsAncestorOf,MatchesFilter):
             
         filt = MatchesFilter(self.list[0:1])
         filt.prepare(db)
-        for person_handle in db.get_person_handles(sort_handles=False):
+        for person_handle in db.iter_person_handles(sort_handles=False):
             person = db.get_person_from_handle( person_handle)
             if filt.apply (db, person):
                 self.init_ancestor_list (db,person,first)

src/Filters/Rules/Person/_IsChildOfFilterMatch.py

@@ -53,7 +53,7 @@ class IsChildOfFilterMatch(MatchesFilter):
         self.map = {}
         filt = MatchesFilter(self.list)
         filt.prepare(db)
-        for person_handle in db.get_person_handles(sort_handles=False):
+        for person_handle in db.iter_person_handles(sort_handles=False):
             person = db.get_person_from_handle( person_handle)
             if filt.apply (db, person):
                 self.init_list (person)

src/Filters/Rules/Person/_IsDescendantOfFilterMatch.py

@@ -67,7 +67,7 @@ class IsDescendantOfFilterMatch(IsDescendantOf,MatchesFilter):
 
         filt = MatchesFilter(self.list[0:1])
         filt.prepare(db)
-        for person_handle in db.get_person_handles(sort_handles=False):
+        for person_handle in db.iter_person_handles(sort_handles=False):
             person = db.get_person_from_handle( person_handle)
             if filt.apply (db, person):
                 self.init_list (person,first)

src/Filters/Rules/Person/_IsParentOfFilterMatch.py

@@ -53,7 +53,7 @@ class IsParentOfFilterMatch(MatchesFilter):
         self.map = {}
         filt = MatchesFilter(self.list)
         filt.prepare(db)
-        for person_handle in db.get_person_handles(sort_handles=False):
+        for person_handle in db.iter_person_handles(sort_handles=False):
             person = db.get_person_from_handle(person_handle)
             if filt.apply (db, person):
                 self.init_list (person)

src/Filters/Rules/Person/_IsSiblingOfFilterMatch.py

@@ -52,7 +52,7 @@ class IsSiblingOfFilterMatch(MatchesFilter):
         self.map = {}
         filt = MatchesFilter(self.list)
         filt.prepare(db)
-        for person_handle in db.get_person_handles(sort_handles=False):
+        for person_handle in db.iter_person_handles():
             person = db.get_person_from_handle( person_handle)
             if filt.apply (db, person):
                 self.init_list (person)

src/Filters/_GenericFilter.py

@@ -193,11 +193,8 @@ class GenericFilter(object):
         return count == 1
 
     def or_test(self, db, person):
-        for rule in self.flist:
-            if rule.apply(db, person):
-                return True
-        return False
-    
+        return any(rule.apply(db, person) for rule in self.flist) 
+
     def get_check_func(self):
         try:
             m = getattr(self, 'check_' + self.logical_op)

src/Merge/_MergePlace.py

@@ -161,7 +161,7 @@ class MergePlaces(ManagedWindow.ManagedWindow):
 
         # replace references in other objetcs
         # people
-        for handle in self.db.get_person_handles(sort_handles=False):
+        for handle in self.db.iter_person_handles():
             person = self.db.get_person_from_handle(handle)
             if person.has_handle_reference('Place',self.old_handle):
                 person.replace_handle_reference('Place',

src/Merge/_MergeSource.py

@@ -165,7 +165,7 @@ class MergeSources(ManagedWindow.ManagedWindow):
         # replace handles
 
         # people
-        for handle in self.db.get_person_handles(sort_handles=False):
+        for handle in self.db.iter_person_handles():
             person = self.db.get_person_from_handle(handle)
             if person.has_source_reference(self.old_handle):
                 person.replace_source_references(self.old_handle,