Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

consistency between offset and non-offset setters

Browse Source 
added ugly parameter _update2 to set_yr_mon_day, needs refactoring

svn: r23058
This commit is contained in:
Vassilii Khachaturov 2013-09-08 19:23:23 +00:00
parent 39927c45bd
commit a702a815b3
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gramps/gen/lib/date.py
View File

@ -1280,13 +1280,15 @@ class Date(object):
dv[pos_day] = day dv[pos_day] = day
self.dateval = tuple(dv) self.dateval = tuple(dv)
def set_yr_mon_day(self, year, month, day): def set_yr_mon_day(self, year, month, day, _update2 = True):
""" """
Set the year, month, and day values. Set the year, month, and day values.
""" """
self.__set_yr_mon_day(year, month, day, self.__set_yr_mon_day(year, month, day,
Date._POS_YR, Date._POS_MON, Date._POS_DAY) Date._POS_YR, Date._POS_MON, Date._POS_DAY)
self._calc_sort_value() self._calc_sort_value()
if _update2 and self.is_compound():
self.set2_yr_mon_day(year, month, day)
def _assert_compound(self): def _assert_compound(self):
if not self.is_compound(): if not self.is_compound():
@ -1331,7 +1333,7 @@ class Date(object):
self.dateval = tuple(dv) self.dateval = tuple(dv)
self._calc_sort_value() self._calc_sort_value()
if day != 0 or dv[Date._POS_DAY] > 28: if day != 0 or dv[Date._POS_DAY] > 28:
self.set_yr_mon_day(*self.offset(day)) self.set_yr_mon_day(*self.offset(day), _update2 = False)
if self.is_compound(): if self.is_compound():
self.set2_yr_mon_day_offset(year, month, day) self.set2_yr_mon_day_offset(year, month, day)
@ -1392,8 +1394,6 @@ class Date(object):
""" """
retval = Date(self) retval = Date(self)
retval.set_yr_mon_day(year, month, day) retval.set_yr_mon_day(year, month, day)
if self.is_compound():
retval.set2_yr_mon_day(year, month, day)
return retval return retval
def set_year(self, year): def set_year(self, year):

6
gramps/gen/lib/test/date_test.py
View File

@ -444,10 +444,10 @@ class Test_set2(BaseDateTest):
self.assertEqual(start, (2000, 1, 1)) self.assertEqual(start, (2000, 1, 1))
self.assertEqual(stop, (2013, 2, 2)) self.assertEqual(stop, (2013, 2, 2))
def test_set2_ymd_overrides_stop_date(self): def test_set_ymd_overrides_both_dates(self):
self.date.set2_yr_mon_day(2013, 2, 2) self.date.set_yr_mon_day(2013, 2, 2)
start,stop = self.date.get_start_stop_range() start,stop = self.date.get_start_stop_range()
self.assertEqual(start, (2000, 1, 1)) self.assertEqual(start, stop)
self.assertEqual(stop, (2013, 2, 2)) self.assertEqual(stop, (2013, 2, 2))
def test_set_ymd_offset_updates_both_ends(self): def test_set_ymd_offset_updates_both_ends(self):