4198: Person view does not remove a row correctly when two people are merged.

This patch improves on the context changes:
 * avoid use of transaction_xx methods
 * force an abort in case of unclean transaction

Backward compatibility is broken to achieve this.


svn: r16680

src/plugins/import/ImportXml.py

@@ -43,6 +43,7 @@ LOG = logging.getLogger(".ImportXML")
 from QuestionDialog import ErrorDialog, WarningDialog
 import gen.mime
 import gen.lib
+from gen.db import DbTxn
 import Utils
 import DateHandler
 from gen.display.name import displayer as name_displayer
@@ -771,8 +772,8 @@ class GrampsParser(UpdateCallback):
             no_magic = True
         else:
             no_magic = False
-        with self.db.transaction_begin(_("Gramps XML import"), batch=True,
-                                       no_magic=no_magic) as self.trans:
+        with DbTxn(_("Gramps XML import"), self.db, batch=True,
+                   no_magic=no_magic) as self.trans:
             self.set_total(linecount)
 
             self.db.disable_signals()