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

provide sensible defautls for all Date.set params

Browse Source 
svn: r23126
This commit is contained in:
Vassilii Khachaturov 2013-09-14 15:44:04 +00:00
parent 307b8519b2
commit 4d82a70eaa
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1493,30 +1493,46 @@ class Date(object):
day = max(d, 1) day = max(d, 1)
return (year, month, day) return (year, month, day)
def set(self, quality, modifier, calendar, value, text=None, def set(self, quality=None, modifier=None, calendar=None,
newyear=0): value=None,
text=None, newyear=0):
""" """
Set the date to the specified value. Set the date to the specified value.
Parameters are:: Parameters are::
quality - The date quality for the date (see get_quality quality - The date quality for the date (see get_quality
for more information) for more information).
Defaults to the previous value for the date.
modified - The date modifier for the date (see get_modifier modified - The date modifier for the date (see get_modifier
for more information) for more information)
Defaults to the previous value for the date.
calendar - The calendar associated with the date (see calendar - The calendar associated with the date (see
get_calendar for more information). get_calendar for more information).
Defaults to the previous value for the date.
value - A tuple representing the date information. For a value - A tuple representing the date information. For a
non-compound date, the format is (DD, MM, YY, slash) non-compound date, the format is (DD, MM, YY, slash)
and for a compound date the tuple stores data as and for a compound date the tuple stores data as
(DD, MM, YY, slash1, DD, MM, YY, slash2) (DD, MM, YY, slash1, DD, MM, YY, slash2)
Defaults to the previous value for the date.
text - A text string holding either the verbatim user input text - A text string holding either the verbatim user input
or a comment relating to the date. or a comment relating to the date.
Defaults to the previous value for the date.
newyear - The newyear code, or tuple representing (month, day) newyear - The newyear code, or tuple representing (month, day)
of newyear day. of newyear day.
Defaults to 0.
The sort value is recalculated. The sort value is recalculated.
""" """
if quality is None:
quality = self.quality
if modifier is None:
modifier = self.modifier
if calendar is None:
calendar = self.calendar
if value is None:
value = self.value
if modifier in (Date.MOD_NONE, Date.MOD_BEFORE, if modifier in (Date.MOD_NONE, Date.MOD_BEFORE,
Date.MOD_AFTER, Date.MOD_ABOUT) and len(value) < 4: Date.MOD_AFTER, Date.MOD_ABOUT) and len(value) < 4:

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

@ -430,9 +430,9 @@ class Test_set2(BaseDateTest):
""" """
def setUp(self): def setUp(self):
self.date = d = Date() self.date = d = Date()
d.set(Date.QUAL_NONE, Date.MOD_RANGE, Date.CAL_GREGORIAN, d.set(modifier=Date.MOD_RANGE,
#d m y sl--d m y sl #d m y sl--d m y sl
(1, 1, 2000, 0, 1, 1, 2010, 0)) value=(1, 1, 2000, 0, 1, 1, 2010, 0))
def testStartStopSanity(self): def testStartStopSanity(self):
start,stop = self.date.get_start_stop_range() start,stop = self.date.get_start_stop_range()