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

7197: refactor code

Browse Source 
extract Date._adjust_newyear out of Date.set
This commit is contained in:
Vassilii Khachaturov 2013-11-13 22:34:24 +02:00
parent b3ab87bc5a
commit 4147721112
1 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1525,6 +1525,30 @@ class Date(object):
day = max(d, 1) day = max(d, 1)
return (year, month, day) return (year, month, day)
def _adjust_newyear(self):
"""
Returns year adjustment performed (0 or -1).
"""
ny = self.get_new_year()
year_delta = 0
if ny: # new year offset?
if ny == Date.NEWYEAR_MAR1:
split = (3, 1)
elif ny == Date.NEWYEAR_MAR25:
split = (3, 25)
elif ny == Date.NEWYEAR_SEP1:
split = (9, 1)
elif isinstance(ny, (list, tuple)):
split = ny
else:
split = (0, 0)
if (self.get_month(), self.get_day()) >= split and split != (0, 0):
year_delta = -1
d1 = Date(self.get_year() + year_delta, self.get_month(), self.get_day())
d1.set_calendar(self.calendar)
self.sortval = d1.sortval
return year_delta
def set(self, quality=None, modifier=None, calendar=None, def set(self, quality=None, modifier=None, calendar=None,
value=None, value=None,
text=None, newyear=0): text=None, newyear=0):
@ -1603,24 +1627,7 @@ class Date(object):
self.set_calendar(Date.CAL_JULIAN) self.set_calendar(Date.CAL_JULIAN)
self.recalc_sort_value() self.recalc_sort_value()
ny = self.get_new_year() year_delta = self._adjust_newyear()
year_delta = 0
if ny: # new year offset?
if ny == Date.NEWYEAR_MAR1:
split = (3, 1)
elif ny == Date.NEWYEAR_MAR25:
split = (3, 25)
elif ny == Date.NEWYEAR_SEP1:
split = (9, 1)
elif isinstance(ny, (list, tuple)):
split = ny
else:
split = (0, 0)
if (self.get_month(), self.get_day()) >= split and split != (0, 0):
year_delta = -1
d1 = Date(self.get_year() + year_delta, self.get_month(), self.get_day())
d1.set_calendar(self.calendar)
self.sortval = d1.sortval
if text: if text:
self.text = text self.text = text