From 7242f9d6623fe7fe2e77d184c1d16c86e41e6bd2 Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Wed, 2 Jan 2013 03:01:42 +0000 Subject: [PATCH] 4719: Narweb Privacy issue, probably_alive uses spouse birth/death directly svn: r20935 --- gramps/gen/utils/alive.py | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/gramps/gen/utils/alive.py b/gramps/gen/utils/alive.py index 8408bddc0..91c804a89 100644 --- a/gramps/gen/utils/alive.py +++ b/gramps/gen/utils/alive.py @@ -226,13 +226,25 @@ class ProbablyAlive(object): if mother_handle == person.handle and father_handle: father = self.db.get_person_from_handle(father_handle) date1, date2, explain, other = self.probably_alive_range(father, is_spouse=True) - if date1 and date2: - return date1, date2, _("a spouse, ") + explain, other + if date1 and date1.get_year() != 0: + return (gen.lib.Date().copy_ymd(date1.get_year() - self.AVG_GENERATION_GAP), + gen.lib.Date().copy_ymd(date1.get_year() - self.AVG_GENERATION_GAP + self.MAX_AGE_PROB_ALIVE), + _("a spouse's birth-related date, ") + explain, other) + elif date2 and date2.get_year() != 0: + return (gen.lib.Date().copy_ymd(date2.get_year() + self.AVG_GENERATION_GAP - self.MAX_AGE_PROB_ALIVE), + gen.lib.Date().copy_ymd(date2.get_year() + self.AVG_GENERATION_GAP), + _("a spouse's death-related date, ") + explain, other) elif father_handle == person.handle and mother_handle: mother = self.db.get_person_from_handle(mother_handle) date1, date2, explain, other = self.probably_alive_range(mother, is_spouse=True) - if date1 and date2: - return date1, date2, _("a spouse, ") + explain, other + if date1 and date1.get_year() != 0: + return (gen.lib.Date().copy_ymd(date1.get_year() - self.AVG_GENERATION_GAP), + gen.lib.Date().copy_ymd(date1.get_year() - self.AVG_GENERATION_GAP + self.MAX_AGE_PROB_ALIVE), + _("a spouse's birth-related date, ") + explain, other) + elif date2 and date2.get_year() != 0: + return (gen.lib.Date().copy_ymd(date2.get_year() + self.AVG_GENERATION_GAP - self.MAX_AGE_PROB_ALIVE), + gen.lib.Date().copy_ymd(date2.get_year() + self.AVG_GENERATION_GAP), + _("a spouse's death-related date, ") + explain, other) # Let's check the family events and see if we find something for ref in family.get_event_ref_list(): if ref: