From 298030620ba31f893fcd27ef811ea6368c9b62c7 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Sun, 16 Dec 2001 14:11:56 +0000 Subject: [PATCH] Fixed relationship calculator svn: r627 --- gramps/src/ReadXML.py | 1 - gramps/src/plugins/RelCalc.py | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/gramps/src/ReadXML.py b/gramps/src/ReadXML.py index a8847062c..49a71cbfd 100644 --- a/gramps/src/ReadXML.py +++ b/gramps/src/ReadXML.py @@ -133,7 +133,6 @@ def loadData(database, filename, callback=None): f.close() except IOError,msg: use_gzip = 0 - f.close() else: use_gzip = 0 diff --git a/gramps/src/plugins/RelCalc.py b/gramps/src/plugins/RelCalc.py index 3b01de59d..3e89e0735 100644 --- a/gramps/src/plugins/RelCalc.py +++ b/gramps/src/plugins/RelCalc.py @@ -226,9 +226,9 @@ class RelCalc: text = secondName + get_prefix(firstRel-1,"niece") + firstName + "." else: if secondRel > firstRel: - text = secondName + cousin(secondRel-1,secondRel-firstRel) + firstName + "." + text = secondName + cousin(firstRel-1,secondRel-firstRel) + firstName + "." else: - text = secondName + cousin(firstRel-1,firstRel-secondRel) + firstName + "." + text = secondName + cousin(secondRel-1,firstRel-secondRel) + firstName + "." text1 = self.glade.get_widget("text1") text1.set_point(0)