From 4115e92d1cb99caeaa79da1d514a2f17b10ae0cd Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Mon, 6 Mar 2006 22:30:17 +0000 Subject: [PATCH] fix parameters svn: r6092 --- gramps2/ChangeLog | 2 ++ gramps2/src/GrampsDb/_GrampsDbBase.py | 2 +- gramps2/src/GrampsDb/_ReadXML.py | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index a8f002584..3f94c80c3 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,4 +1,6 @@ 2006-03-06 Don Allingham + * src/GrampsDb/_GrampsDbBase.py: handle the default argument of + no_magic * src/Editors/_EditFamily.py: handle the fact that family information is not a simple list. diff --git a/gramps2/src/GrampsDb/_GrampsDbBase.py b/gramps2/src/GrampsDb/_GrampsDbBase.py index 671544548..47a2c4ebc 100644 --- a/gramps2/src/GrampsDb/_GrampsDbBase.py +++ b/gramps2/src/GrampsDb/_GrampsDbBase.py @@ -1162,7 +1162,7 @@ class GrampsDbBase(GrampsDBCallback): """ self.rprefix = self._validated_id_prefix(val,"R") - def transaction_begin(self,msg="",batch=False): + def transaction_begin(self,msg="",batch=False, match=False, no_magic=False): """ Creates a new Transaction tied to the current UNDO database. The transaction has no effect until it is committed using the diff --git a/gramps2/src/GrampsDb/_ReadXML.py b/gramps2/src/GrampsDb/_ReadXML.py index 110d59328..34350f755 100644 --- a/gramps2/src/GrampsDb/_ReadXML.py +++ b/gramps2/src/GrampsDb/_ReadXML.py @@ -603,7 +603,7 @@ class GrampsParser: self.p.EndElementHandler = self.endElement self.p.CharacterDataHandler = self.characters self.p.ParseFile(file) - + self.db.set_researcher(self.owner) if self.home != None: person = self.db.find_person_from_handle(self.home,self.trans)