From bdaee91064c86ae8b122ba84dce33822a2b09d68 Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Fri, 27 Jul 2012 15:31:24 +0000 Subject: [PATCH] Added User when drag/drop filename on Family Tree manager; added comments in cli interface svn: r20113 --- src/cli/clidbman.py | 6 ++++++ src/gui/dbman.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/cli/clidbman.py b/src/cli/clidbman.py index 53df3be34..09949f6a8 100644 --- a/src/cli/clidbman.py +++ b/src/cli/clidbman.py @@ -286,6 +286,12 @@ class CLIDbManager(object): Attempt to import the provided file into a new database. A new database will only be created if an appropriate importer was found. + + @param filename: a fully-qualified path, filename, and + extension to open. + + @param user: a cli.User or gui.User instance for managing user + interaction. @return: A tuple of (new_path, name) for the new database or (None, None) if no import was performed. diff --git a/src/gui/dbman.py b/src/gui/dbman.py index 6eaccb844..4cb80ea6c 100644 --- a/src/gui/dbman.py +++ b/src/gui/dbman.py @@ -745,7 +745,7 @@ class DbManager(CLIDbManager): if drag_value and urlparse.urlparse(drag_value).scheme != "": fname, title = [], [] for treename in [v.strip() for v in drag_value.split("\n") if v.strip() != '']: - f, t = self.import_new_db(treename, None) + f, t = self.import_new_db(treename, User()) fname.append(f) title.append(t) return fname, title