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

7197: date sanity check breaks on Julian+Mar25

Browse Source 
Date.convert_calendar resets the new year setting to 0,
so the sanity check fails. Commit the initial fix that
unblocks the failing test.
This commit is contained in:
Vassilii Khachaturov 2013-11-13 17:39:47 +02:00
parent 78cae43a32
commit c4daa151a5
1 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1634,29 +1634,35 @@ class Date(object):
# Did the roundtrip change the date value?! # Did the roundtrip change the date value?!
if sanity.dateval != value: if sanity.dateval != value:
# Maybe it is OK because of undetermined value adjustment? if sanity.get_new_year() != self.get_new_year():
zl = zip(sanity.dateval, value) # convert_calendar resets the new year, so the date value will differ.
# Loop over all values present, whether compound or not # Just check the sort value matches then.
for d,m,y,sl in zip(*[iter(zl)]*4): if self.sortval != sanity.sortval:
# each of d,m,y,sl is a pair from dateval and value, to compare log.debug("Sanity check failed - self: {}, sanity: {}".format(
self.to_struct(), sanity.to_struct()))
raise DateError("Invalid date value {}".format(value))
else:
# Maybe it is OK because of undetermined value adjustment?
zl = zip(sanity.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):
log.debug("Sanity check failed - self: {}, sanity: {}".format(
self.to_struct(), sanity.to_struct()))
raise DateError("Invalid day/month {} passed in value {}".
format(original, value))
for adjusted,original in d,m: adjusted,original = y
adjusted -= year_delta
if adjusted != original and not(original == 0 and adjusted == 1): if adjusted != original and not(original == 0 and adjusted == 1):
log.debug("Sanity check failed - self: {}, sanity: {}".format( log.debug("Sanity check failed - self: {}, sanity: {}".format(
self.to_struct(), sanity.to_struct())) self.to_struct(), sanity.to_struct()))
raise DateError("Invalid day/month {} passed in value {}". raise DateError("Invalid year {} passed in value {}".
format(original, value)) format(original, value))
adjusted,original = y # ignore slash difference
adjusted -= year_delta
if adjusted != original and not(original == 0 and adjusted == 1):
log.debug("Sanity check failed - self: {}, sanity: {}".format(
self.to_struct(), sanity.to_struct()))
raise DateError("Invalid year {} passed in value {}".
format(original, value))
# ignore slash difference
def recalc_sort_value(self): def recalc_sort_value(self):
""" """