Two fixes to address issues with living proxy and GEDCOM export

svn: r15295
This commit is contained in:
Doug Blank
2010-05-01 14:29:52 +00:00
parent 97eff89616
commit 38d8332970
2 changed files with 3 additions and 1 deletions

View File

@@ -306,7 +306,7 @@ class ProxyDbBase(DbReadBase):
""" """
Returns obj if predicate is True or not callable, else returns None Returns obj if predicate is True or not callable, else returns None
""" """
if predicate is not None: if predicate is not None and obj is not None:
return obj if predicate(obj.handle) else None return obj if predicate(obj.handle) else None
return obj return obj

View File

@@ -1286,6 +1286,8 @@ class GedcomWriter(UpdateCallback):
return return
src = self.dbase.get_source_from_handle(src_handle) src = self.dbase.get_source_from_handle(src_handle)
if src is None:
return
# Reference to the source # Reference to the source
self.__writeln(level, "SOUR", "@%s@" % src.get_gramps_id()) self.__writeln(level, "SOUR", "@%s@" % src.get_gramps_id())