3291: "Probably alive" misses persons definitely alive

svn: r13374
This commit is contained in:
Doug Blank 2009-10-16 02:52:06 +00:00
parent 764f5d846d
commit e420278a13

View File

@ -674,9 +674,7 @@ def not_too_old(date, current_year=None):
time_struct = time.localtime(time.time()) time_struct = time.localtime(time.time())
current_year = time_struct[0] current_year = time_struct[0]
year = date.get_year() year = date.get_year()
if year > current_year: return (year != 0 and abs(current_year - year) < _MAX_AGE_PROB_ALIVE)
return False
return (year != 0 and current_year - year < _MAX_AGE_PROB_ALIVE)
def too_old(date, current_year=None): def too_old(date, current_year=None):
if current_year: if current_year:
@ -685,9 +683,7 @@ def too_old(date, current_year=None):
time_struct = time.localtime(time.time()) time_struct = time.localtime(time.time())
the_current_year = time_struct[0] the_current_year = time_struct[0]
year = date.get_year() year = date.get_year()
if year > the_current_year: return (year != 0 and abs(the_current_year - year) > _MAX_AGE_PROB_ALIVE)
return True
return (year != 0 and the_current_year - year > _MAX_AGE_PROB_ALIVE)
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #