From 06013248517ab0dd7711f66de33fea9f41d81582 Mon Sep 17 00:00:00 2001
From: Doug Blank <dblank@cs.brynmawr.edu>
Date: Sat, 22 Aug 2015 21:44:37 -0400
Subject: [PATCH] Revert "DbTxn: use no_magic explicitly"

This reverts commit ecc078b891a08581d7d63323e28fa3f1cdf4676a.
---
 gramps/gen/db/generic.py                       | 4 ++--
 gramps/plugins/database/bsddb_support/write.py | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gramps/gen/db/generic.py b/gramps/gen/db/generic.py
index 5f9d51821..d642e9b95 100644
--- a/gramps/gen/db/generic.py
+++ b/gramps/gen/db/generic.py
@@ -1481,14 +1481,14 @@ class DbGeneric(DbWriteBase, DbReadBase, UpdateCallback, Callback):
         """
         return DbGenericTxn
 
-    def DbTxn(self, message, batch=False, no_magic=False):
+    def DbTxn(self, message, batch=False, **kwargs):
         """
         Create a transaction for this database type.
 
         kwargs may contain:
            no_magic
         """
-        return DbGenericTxn(message, batch)
+        return DbGenericTxn(message, batch, **kwargs)
 
     def get_from_name_and_handle(self, table_name, handle):
         """
diff --git a/gramps/plugins/database/bsddb_support/write.py b/gramps/plugins/database/bsddb_support/write.py
index ea4ff7af8..98dd2b5a7 100644
--- a/gramps/plugins/database/bsddb_support/write.py
+++ b/gramps/plugins/database/bsddb_support/write.py
@@ -2430,14 +2430,14 @@ class DbBsddb(DbBsddbRead, DbWriteBase, UpdateCallback):
         """
         return DbTxn
 
-    def DbTxn(self, message, batch=False, no_magic=False):
+    def DbTxn(self, message, batch=False, **kwargs):
         """
         Create a transaction for this database type.
 
         kwargs may contain:
            no_magic
         """
-        return DbTxn(message, self, batch, no_magic)
+        return DbTxn(message, self, batch, **kwargs)
 
     def backup(self):
         """