From 8a7b8fe3e364419537f3dfbf8dfc1f7d1d013118 Mon Sep 17 00:00:00 2001 From: Kees Bakker Date: Thu, 11 Dec 2008 13:08:37 +0000 Subject: [PATCH] Bugfix in collect_data. Was overwriting 'year', and then confused the probably_alive call. * src/plugins/WebCal.py svn: r11455 --- src/plugins/WebCal.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/plugins/WebCal.py b/src/plugins/WebCal.py index 17ff226ea..972df998e 100644 --- a/src/plugins/WebCal.py +++ b/src/plugins/WebCal.py @@ -67,11 +67,6 @@ from gettext import gettext as _ from xml.parsers import expat -try: - set() -except: - from sets import Set as set - #------------------------------------------------------------------------ # # Set up logging @@ -1192,7 +1187,7 @@ class WebCalReport(Report): # increase progress bar self.progress.step() - def collect_data(self, year): + def collect_data(self, this_year): """ This method runs through the data, and collects the relevant dates and text. @@ -1225,7 +1220,7 @@ class WebCalReport(Report): # if person is dead, STOP! Nothing further to do if death_date == None: - living = probably_alive(person, self.database, _make_date(year, 1, 1), 0) + living = probably_alive(person, self.database, _make_date(this_year, 1, 1), 0) # add birthday if requested if self.birthday and birth_date != None and ((self.alive and living) or not self.alive): @@ -1281,7 +1276,7 @@ class WebCalReport(Report): spouse_name = _get_short_name(spouse) short_name = _get_short_name(person) if self.alive: - if not probably_alive(spouse, self.database, _make_date(year, 1, 1), 0): + if not probably_alive(spouse, self.database, _make_date(this_year, 1, 1), 0): continue are_married = _get_marrital_status(fam, self.database) if are_married is not None: