From 713344f2f8f3654ec2ee1c240d21c40cb74931e4 Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Fri, 11 Jun 2010 00:39:15 +0000 Subject: [PATCH] Use Today for living filter date, and use basedb for determining living status svn: r15556 --- src/gen/proxy/living.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gen/proxy/living.py b/src/gen/proxy/living.py index 18cd814a7..21fe67929 100644 --- a/src/gen/proxy/living.py +++ b/src/gen/proxy/living.py @@ -36,7 +36,8 @@ Proxy class for the GRAMPS databases. Filter out all living people. # #------------------------------------------------------------------------- from proxybase import ProxyDbBase -from gen.lib import Date, Person, Name +from gen.lib import Person, Name +from gen.lib.date import Today from Utils import probably_alive import config @@ -78,8 +79,7 @@ class LivingProxyDb(ProxyDbBase): ProxyDbBase.__init__(self, dbase) self.mode = mode if current_year is not None: - self.current_date = Date() - self.current_date.set_year(current_year) + self.current_date = Today() else: self.current_date = None self.years_after_death = years_after_death @@ -192,7 +192,7 @@ class LivingProxyDb(ProxyDbBase): Returns False if the person is not considered living. """ return probably_alive( person, - self.db, + self.basedb, self.current_date, self.years_after_death )