Sync addons-source@maintenance/gramps60 with upstream/gramps-project (2026-05-22)

Author: github-actions[bot]

GrampsWebSync/grampswebsync.gpr.py

@@ -28,7 +28,7 @@
     id="gramps_web_sync",
     name=_("Gramps Web Sync"),
     description=_("Synchronizes a local database with a Gramps Web instance."),
-    version = '1.3.10',
+    version = '1.3.11',
     gramps_target_version="6.0",
     status=STABLE,
     fname="grampswebsync.py",

GrampsWebSync/grampswebsync.py

@@ -180,6 +180,7 @@ def __init__(self, dbstate, user, options_class, name, *args, **kwargs) -> None:
 
         self.db1 = dbstate.db
         self.db2 = None
+        self._closing = False
         self._download_timestamp = 0
         self._changes: Actions | None = None
         self._sync: WebApiSyncDiffHandler | None = None
@@ -213,6 +214,14 @@ def build_menu_names(self, obj):  # type: ignore
     def do_close(self, assistant):
         """Close the assistant."""
         LOG.debug("Closing Gramps Web Sync addon.")
+        self._closing = True
+        if self.db2 is not None:
+            LOG.debug("Closing in-memory remote database.")
+            self.db2.close()
+            self.db2 = None
+        # Clear the diff handler which holds references to both db1 and db2
+        self._sync = None
+        self._changes = None
         position = self.window.get_position()  # crock
         self.assistant.hide()
         self.window.move(position[0], position[1])
@@ -500,6 +509,8 @@ def async_compare_dbs(self):
 
     def get_diff_actions(self) -> None:
         """Download the remote data, import it and compare it to local."""
+        if self._closing:
+            return
         LOG.info("Downloading Gramps XML file.")
         path = self.handle_server_errors(self.api.download_xml)
         if path is None:
@@ -545,6 +556,8 @@ def async_transfer_media(self):
 
     def _async_transfer_media(self):
         """Upload/download media files."""
+        if self._closing:
+            return
         self.handle_server_errors(self.download_files)
         if self.conclusion.error:
             return
@@ -665,6 +678,8 @@ def _async_commit_actions_to_remote(
         self, payload: dict[str, "Any"], force: bool
     ) -> None:
         """Upload/download media files."""
+        if self._closing:
+            return
         LOG.debug("Committing changes to remote database.")
         self.handle_server_errors(
             self.api.commit,

GrampyScript/GrampyScript.gpr.py

@@ -23,7 +23,7 @@
     name=_("Gram.py Script"),
     description=_("Run a special Gramps Python script"),
     status=STABLE,
-    version = '0.0.2',
+    version = '0.0.3',
     fname="GrampyScript.py",
     authors=["Doug Blank"],
     authors_email=["doug.blank@gmail.com"],

GrampyScript/datadict2.py

@@ -45,6 +45,7 @@ def flatten(lst):
             result.append(item)
     return result
 
+
 class NoneData:
 
     # def __setattr__(self, attr, value):
@@ -68,6 +69,9 @@ def __call__(self, *args, **kwargs):
         # print(args, kwargs)
         return ""
 
+    def __iter__(self):
+        return iter([])
+
 
 class DataDict2(dict):
     """
@@ -234,7 +238,9 @@ def tags(self):
     def citations(self):
         return DataList2(
             [
-                DataDict2(sa.dbase.get_raw_citation_data(handle), callback=self.callback)
+                DataDict2(
+                    sa.dbase.get_raw_citation_data(handle), callback=self.callback
+                )
                 for handle in self.citation_list
             ],
         )
@@ -252,6 +258,10 @@ def events(self):
             ],
         )
 
+    @property
+    def reference(self):
+        return DataDict2(sa.dbase.get_raw_person_data(self.ref), callback=self.callback)
+
     @property
     def attributes(self):
         return self.attribute_list
@@ -268,6 +278,22 @@ def lds_ords(self):
     def references(self):
         return self.person_ref_list
 
+    @property
+    def back_references(self):
+        retval = []
+        for obj_type, ohandle in sa.dbase.find_backlink_handles(self.handle):
+            obj = sa.dbase.method("get_%s_from_handle", obj_type)(ohandle)
+            retval.append(DataDict2(obj, callback=self.callback))
+        return DataList2(retval)
+
+    @property
+    def back_references_recursively(self):
+        retval = []
+        for obj_type, ohandle in self._object.get_referenced_handles_recursively():
+            obj = sa.dbase.method("get_%s_from_handle", obj_type)(ohandle)
+            retval.append(DataDict2(obj, callback=self.callback))
+        return DataList2(retval)
+
     @property
     def name(self):
         if self["_class"] == "Person":

LinesOfDescendency/lines-of-descendency.gpr.py

@@ -33,7 +33,7 @@
         "Prints out all descendency lines "
         "from a given ancestor to a given descendent in text."
     ),
-    version = '1.1.40',
+    version = '1.1.41',
     gramps_target_version="6.0",
     status=STABLE,  # not yet tested with python 3
     fname="lines-of-descendency.py",

LinesOfDescendency/lines-of-descendency.py

@@ -126,7 +126,14 @@ def write_path(self, path):
                 mother if mother != handle \
                     else family.get_father_handle()
             handle = next_handle
-            spouse = self.database.get_person_from_handle(spouse_handle)
+            # Bug 12913: a family may have only one parent defined,
+            # in which case spouse_handle is None and
+            # get_person_from_handle raises HandleError. Guard the
+            # lookup so the existing "N.N." fallback still applies.
+            if spouse_handle:
+                spouse = self.database.get_person_from_handle(spouse_handle)
+            else:
+                spouse = None
             if spouse:
                 spouse_name = _nd.display(spouse)
             else:

LinesOfDescendency/tests/test_linesofdescendency_guards.py

@@ -127,5 +127,100 @@ def test_both_present_does_not_raise(self):
         self.assertIsNotNone(report.ancestor)
 
 
+class TestWritePathMissingSpouse(unittest.TestCase):
+    """Bug 12913: ``write_path`` raised ``HandleError: Handle is None``
+    when a family in the descent chain had only one parent defined
+    (so ``spouse_handle`` came back as ``None``) and the addon called
+    ``get_person_from_handle(None)`` directly. The guard added in
+    this PR catches the ``None`` before the lookup and falls through
+    to the existing ``'N.N.'`` spouse-name fallback that was already
+    in place for the "spouse object missing" case."""
+
+    @classmethod
+    def setUpClass(cls):
+        try:
+            cls.impl = _load_impl()
+        except ImportError as err:
+            raise unittest.SkipTest("Gramps not importable: %s" % err)
+        cls.LinesOfDescendency = cls.impl.LinesOfDescendency
+
+    @staticmethod
+    def _report_instance(database, doc):
+        """Build a ``LinesOfDescendency`` instance via ``__new__`` so
+        ``Report.__init__`` (which we don't need) doesn't run, and
+        wire up the minimum attributes ``write_path`` touches."""
+        report = TestWritePathMissingSpouse.LinesOfDescendency.__new__(
+            TestWritePathMissingSpouse.LinesOfDescendency
+        )
+        report.database = database
+        report.doc = doc
+        report.line = 1
+        return report
+
+    @staticmethod
+    def _person(handle, gramps_id, parents_family_handle):
+        """Mock person with the minimal API ``write_path`` touches."""
+        person = mock.MagicMock()
+        person.get_handle.return_value = handle
+        person.get_gramps_id.return_value = gramps_id
+        person.get_main_parents_family_handle.return_value = (
+            parents_family_handle
+        )
+        return person
+
+    @staticmethod
+    def _family(mother_handle, father_handle, relationship):
+        family = mock.MagicMock()
+        family.get_mother_handle.return_value = mother_handle
+        family.get_father_handle.return_value = father_handle
+        family.get_relationship.return_value = relationship
+        return family
+
+    def test_single_parent_family_does_not_raise(self):
+        """The reporter's case: a family in the chain has only one
+        parent defined. Pre-fix, ``get_person_from_handle(None)``
+        raised ``HandleError: Handle is None`` and torpedoed the
+        whole report."""
+        # Chain: ancestor (handle "A") -> child (handle "C")
+        # Family F0037 has father "A" and mother = None ("Reeves, Maria"
+        # removed per reporter's repro). When traversing from ancestor
+        # to child, spouse_handle resolves to None.
+        ancestor = self._person("A", "I0001", parents_family_handle=None)
+        child = self._person("C", "I0055", parents_family_handle="F0037")
+        # Family with only the father, no mother:
+        family = self._family(
+            mother_handle=None,
+            father_handle="A",
+            relationship=self.impl.FamilyRelType.MARRIED,
+        )
+
+        database = mock.MagicMock()
+        database.get_person_from_handle.side_effect = lambda h: {
+            "A": ancestor,
+            "C": child,
+        }[h]
+        database.get_family_from_handle.return_value = family
+
+        doc = mock.MagicMock()
+        report = self._report_instance(database, doc)
+
+        # Pre-fix this would raise HandleError; post-fix it must
+        # complete and never call get_person_from_handle with None.
+        report.write_path(["A", "C"])
+
+        # Verify get_person_from_handle was NEVER called with None
+        # -- the whole point of the guard.
+        for call in database.get_person_from_handle.call_args_list:
+            self.assertIsNotNone(call.args[0])
+
+        # Verify the user-visible output still uses the existing
+        # 'N.N.' fallback for the missing-spouse case.
+        written_calls = [str(c) for c in doc.write_text.call_args_list]
+        self.assertTrue(
+            any("N.N." in text for text in written_calls),
+            "Expected 'N.N.' fallback in rendered text; got %r" % written_calls,
+        )
+
+
 if __name__ == "__main__":
     unittest.main()

PostgreSQLEnhanced/postgresqlenhanced.gpr.py

@@ -33,7 +33,7 @@
         "and AI/ML capabilities. For advanced users. "
         "Requires PostgreSQL 15+ with extensions. Gramps Web compatible."
     ),
-    version = '1.5.2',
+    version = '1.5.3',
     gramps_target_version="6.0",
     status=STABLE,
     audience=EXPERT,  # For advanced users who can configure PostgreSQL

PostgreSQLEnhanced/postgresqlenhanced.py

@@ -40,6 +40,7 @@
 import re
 import pickle
 import sys
+import time
 from urllib.parse import urlparse, parse_qs
 
 # -------------------------------------------------------------------------
@@ -1958,7 +1959,6 @@ def _set_metadata(self, key, value, use_txn=True):
                         pass
 
                 if attempt < max_retries - 1:
-                    import time
                     time.sleep(0.01 * (2 ** attempt))  # Exponential backoff
                     continue
                 else:

lxml/etreeGramplet.gpr.py

@@ -11,7 +11,7 @@
     description=_("Gramplet for testing etree with Gramps XML"),
     status=EXPERIMENTAL,
     audience = DEVELOPER,
-    version = '1.2.2',
+    version = '1.2.3',
     gramps_target_version="6.0",
     include_in_listing=True,
     height=400,