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

7045: Setting an invalid date does not raise

Browse Source 
do the sanity checks on a separate date object,
so that the uncertainty expressed with 0 d/m isn't removed

svn: r23124
This commit is contained in:
Vassilii Khachaturov 2013-09-14 15:11:09 +00:00
parent 37e82106dc
commit ad333e937c
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1587,11 +1587,15 @@ class Date(object):
self.sortval += (d1_val - d2_val) + 1 self.sortval += (d1_val - d2_val) + 1
if modifier != Date.MOD_TEXTONLY: if modifier != Date.MOD_TEXTONLY:
self.convert_calendar(self.calendar, known_valid = False) sanity = Date(self)
sanity.convert_calendar(self.calendar, known_valid = False)
# We don't do the roundtrip conversion on self, becaue
# it would remove uncertainty on day/month expressed with zeros
# Did the roundtrip change the date value?! # Did the roundtrip change the date value?!
if self.dateval != value: if sanity.dateval != value:
# Maybe it is OK because of undetermined value adjustment? # Maybe it is OK because of undetermined value adjustment?
zl = zip(self.dateval, value) zl = zip(sanity.dateval, value)
# Loop over all values present, whether compound or not # Loop over all values present, whether compound or not
for d,m,y,sl in zip(*[iter(zl)]*4): 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 # each of d,m,y,sl is a pair from dateval and value, to compare