diff --git a/gramps/gui/dbloader.py b/gramps/gui/dbloader.py index 2b15382e9..b0710f1ae 100644 --- a/gramps/gui/dbloader.py +++ b/gramps/gui/dbloader.py @@ -127,11 +127,7 @@ class DbLoader(CLIDbLoader): if not warn_dialog.run(): return False - GrampsImportFileDialog(self.dbstate, self.uistate, - callback=self.set_info) - - def set_info(self, info): - self.import_info = info + GrampsImportFileDialog(self.dbstate, self.uistate) def import_info_text(self): """ @@ -382,7 +378,7 @@ def format_maker(): class GrampsImportFileDialog(ManagedWindow): - def __init__(self, dbstate, uistate, callback=None): + def __init__(self, dbstate, uistate): """ A dialog to import a file into Gramps """ @@ -430,8 +426,7 @@ class GrampsImportFileDialog(ManagedWindow): # the import_dialog.run() makes it modal, so any change to that # line would require the ManagedWindow.__init__ to be changed also response = import_dialog.run() - if response in (Gtk.ResponseType.CANCEL, - Gtk.ResponseType.DELETE_EVENT): + if response in (Gtk.ResponseType.CANCEL, Gtk.ResponseType.DELETE_EVENT): break elif response == Gtk.ResponseType.OK: filename = import_dialog.get_filename() @@ -455,8 +450,6 @@ class GrampsImportFileDialog(ManagedWindow): plugin.get_import_function(), filename) self.close() - if callback is not None: - callback(self.import_info) return # Finally, we give up and declare this an unknown format diff --git a/gramps/plugins/importer/importgedcom.py b/gramps/plugins/importer/importgedcom.py index f1d866f28..9e87136ee 100644 --- a/gramps/plugins/importer/importgedcom.py +++ b/gramps/plugins/importer/importgedcom.py @@ -149,6 +149,4 @@ def importData(database, filename, user): except GedcomError as msg: user.notify_error(_('Error reading GEDCOM file'), str(msg)) return - ## a "GEDCOM import report" happens in GedcomParser so this is not needed: - ## return ImportInfo({_("Results"): _("done")}) - return None + return ImportInfo({_("Results"): _("done")}) diff --git a/gramps/plugins/importer/importvcard.py b/gramps/plugins/importer/importvcard.py index e8cb4684c..e8bbf2897 100644 --- a/gramps/plugins/importer/importvcard.py +++ b/gramps/plugins/importer/importvcard.py @@ -71,9 +71,7 @@ def importData(database, filename, user): except GrampsImportError as msg: user.notify_error(_("%s could not be opened\n") % filename, str(msg)) return - ## a "VCARD import report" happens in VCardParser so this is not needed: - ## return ImportInfo({_("Results"): _("done")}) - return None + return ImportInfo({_("Results"): _("done")}) def splitof_nameprefix(name):