From b29f2504dbde53a8f1c4b982ae623c4130495b9b Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Wed, 17 Feb 2010 02:45:48 +0000 Subject: [PATCH] Fixed error on probably_alive with people with a future death guess svn: r14405 --- src/Utils.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/Utils.py b/src/Utils.py index 1b4654c31..6556dd09a 100644 --- a/src/Utils.py +++ b/src/Utils.py @@ -818,18 +818,17 @@ def probably_alive(person, db, # SPECIAL CASE: Today: if current_date.match(gen.lib.date.Today(), "=="): if person.get_death_ref(): + # if death in the future: (impossible, unless guess) + # if return_range: + # return (True, birth, death, ("future death, ") + explain, relative) + # else: + # return True if return_range: return (False, birth, death, explain, relative) else: return False if limit: death += limit # add these years to death - # if death in the future: - if (gen.lib.date.Today() - death)[0] < 0: - if return_range: - return (True, birth, death, ("future death, ") + explain, relative) - else: - return True # if the current - birth is too big, not alive: # FIXME: use match here: if (current_date - birth)[0] > pb.MAX_AGE_PROB_ALIVE: