From 1f42fe835f42d4eb6a08dd4a80b6bb68e54ab0f9 Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Sat, 22 Aug 2015 21:44:17 -0400 Subject: [PATCH] Revert "DbTxn: pass db to generic DbTxn" This reverts commit 8e89ceb395efa99b0c78ae40abc7a7a9974fc4df. --- gramps/gen/db/generic.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gramps/gen/db/generic.py b/gramps/gen/db/generic.py index 465804d2d..5f9d51821 100644 --- a/gramps/gen/db/generic.py +++ b/gramps/gen/db/generic.py @@ -385,7 +385,7 @@ class Bookmarks(object): class DbGenericTxn(DbTxn): - def __init__(self, message, batch=False): + def __init__(self, message, db, batch=False): DbTxn.__init__(self, message, db, batch) def get(self, key, default=None, txn=None, **kwargs): @@ -1488,7 +1488,7 @@ class DbGeneric(DbWriteBase, DbReadBase, UpdateCallback, Callback): kwargs may contain: no_magic """ - return DbGenericTxn(message, self, batch) + return DbGenericTxn(message, batch) def get_from_name_and_handle(self, table_name, handle): """