From 92f89387cb4aac8a312e30ae65def24721b2a989 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Fri, 6 May 2005 21:11:46 +0000 Subject: [PATCH] Handle married_rel_str if there is no spouse svn: r4498 --- gramps2/ChangeLog | 2 ++ gramps2/src/ReportUtils.py | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index cd0f56838..ae3d679f9 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,4 +1,6 @@ 2005-05-06 Don Allingham + * src/ReportUtils.py: check for spouse existance before creating a + marriage string - return an empty string instead. * src/ReadXML.py: fix handling of non-gregorian dates * src/EditPerson.py: faster building of place lists using cursors diff --git a/gramps2/src/ReportUtils.py b/gramps2/src/ReportUtils.py index 3bd218905..6f518a7a8 100644 --- a/gramps2/src/ReportUtils.py +++ b/gramps2/src/ReportUtils.py @@ -908,6 +908,11 @@ def married_str(database,person,spouse,event,endnotes=None, def married_rel_str(database,person,family,is_first=True): spouse_handle = find_spouse(person,family) spouse = database.get_person_from_handle(spouse_handle) + + # not all families have a spouse. + if not spouse_handle or not spouse: + return u"" + spouse_name = _nd.display(spouse) if is_first: