From 49316e07e88a8a63e02f7208c05b847a9597423f Mon Sep 17 00:00:00 2001 From: Gerald Britton Date: Thu, 17 Jul 2008 21:03:26 +0000 Subject: [PATCH] Revert 10874 changes to dbdir.py and _GrampsBSDDB.py svn: r10875 --- src/GrampsDbUtils/_GrampsBSDDB.py | 3 ++- src/gen/db/dbdir.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/GrampsDbUtils/_GrampsBSDDB.py b/src/GrampsDbUtils/_GrampsBSDDB.py index d3b567cdb..e5ded8113 100644 --- a/src/GrampsDbUtils/_GrampsBSDDB.py +++ b/src/GrampsDbUtils/_GrampsBSDDB.py @@ -1330,7 +1330,8 @@ class GrampsBSDDB(GrampsDbBase, UpdateCallback): pass def __get_obj_from_gramps_id(self, val, tbl, class_init, prim_tbl): - if str(val) in tbl: + if tbl.has_key(str(val)): + #if str(val) in tbl: data = tbl.get(str(val), txn=self.txn) obj = class_init() ### FIXME: this is a dirty hack that works without no diff --git a/src/gen/db/dbdir.py b/src/gen/db/dbdir.py index d6ba92057..bf556aeb5 100644 --- a/src/gen/db/dbdir.py +++ b/src/gen/db/dbdir.py @@ -1373,7 +1373,8 @@ class GrampsDBDir(GrampsDbBase, UpdateCallback): def __get_obj_from_gramps_id(self, val, tbl, class_init, prim_tbl): try: - if str(val) in tbl: + if tbl.has_key(str(val)): + #if str(val) in tbl: data = tbl.get(str(val), txn=self.txn) obj = class_init() ### FIXME: this is a dirty hack that works without no