From c4daa151a5875a07ff739e3d75efe81c7aa5bc5d Mon Sep 17 00:00:00 2001
From: Vassilii Khachaturov <vassilii@tarunz.org>
Date: Wed, 13 Nov 2013 17:39:47 +0200
Subject: [PATCH] 7197: date sanity check breaks on Julian+Mar25

Date.convert_calendar resets the new year setting to 0,
so the sanity check fails. Commit the initial fix that
unblocks the failing test.
---
 gramps/gen/lib/date.py | 40 +++++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/gramps/gen/lib/date.py b/gramps/gen/lib/date.py
index 8c7d5d731..fe1253e3a 100644
--- a/gramps/gen/lib/date.py
+++ b/gramps/gen/lib/date.py
@@ -1634,29 +1634,35 @@ class Date(object):
 
             # Did the roundtrip change the date value?!
             if sanity.dateval != value:
-                # 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
+                if sanity.get_new_year() != self.get_new_year():
+                    # convert_calendar resets the new year, so the date value will differ.
+                    # Just check the sort value matches then.
+                    if self.sortval != sanity.sortval:
+                        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):
                             log.debug("Sanity check failed - self: {}, sanity: {}".format(
                                 self.to_struct(), sanity.to_struct()))
-                            raise DateError("Invalid day/month {} passed in value {}".
+                            raise DateError("Invalid year {} passed in value {}".
                                     format(original, value))
 
-                    adjusted,original = y
-                    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
-
+                        # ignore slash difference
 
     def recalc_sort_value(self):
         """