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

7045: Date.set on invalid date does not raise

Browse Source 
Now it does, but another test breaks:

Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/loader.py", line 252, in _find_tests
    module = self._get_module_from_name(name)
  File "/usr/lib/python2.7/unittest/loader.py", line 230, in _get_module_from_name
    __import__(name)
  File "/home/vassilii/Gramps/gramps/gen/lib/test/date_test.py", line 136, in <module>
    d.set(quality,modifier,calendar,(4,11,-90,False),"Text comment")
  File "/home/vassilii/Gramps/gramps/gen/lib/date.py", line 1600, in set
    format(original, value))
DateError: Invalid year -90 passed in value (4, 11, -90, False)

because the corresponding year gets adjusted from -90 to 1...

svn: r23121
This commit is contained in:
Vassilii Khachaturov 2013-09-14 13:00:19 +00:00
parent 571e3cffa7
commit ab7d12103f
1 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1540,7 +1540,7 @@ class Date(object):
month = max(value[Date._POS_MON], 1)
day = max(value[Date._POS_DAY], 1)
if year == month == 0 and day == 0:
if year == month == day == 0:
self.sortval = 0
else:
func = Date._calendar_convert[calendar]
@ -1578,6 +1578,28 @@ class Date(object):
d2.set_calendar(self.calendar)
d2_val = d2.sortval
self.sortval += (d1_val - d2_val) + 1
if modifier != Date.MOD_TEXTONLY:
self.convert_calendar(self.calendar, known_valid = False)
# Did the roundtrip change the date value?!
if self.dateval != value:
# Maybe it is OK because of undetermined value adjustment?
zl = zip(self.dateval, value)
# Loop over all values present, whether compound or not
for d,m,y,sl in zip(*[iter(zl)]*4):
# each of d,m,y,sl is a pair from dateval and value, to compare
for adjusted,original in d,m:
if adjusted != original and not(original == 0 and adjusted == 1):
raise DateError("Invalid day/month {} passed in value {}".
format(original, value))
adjusted,original = y
if adjusted != original:
raise DateError("Invalid year {} passed in value {}".
format(original, value))
# ignore slash difference
if text:
self.text = text
@ -1603,11 +1625,13 @@ class Date(object):
func = Date._calendar_convert[self.calendar]
self.sortval = func(year, month, day)
def convert_calendar(self, calendar):
def convert_calendar(self, calendar, known_valid=True):
"""
Convert the date from the current calendar to the specified calendar.
"""
if calendar == self.calendar and self.newyear == Date.NEWYEAR_JAN1:
if (known_valid # if not known valid, round-trip convert anyway
and calendar == self.calendar
and self.newyear == Date.NEWYEAR_JAN1):
return
(year, month, day) = Date._calendar_change[calendar](self.sortval)
if self.is_compound():