Moved make_database to DbState
This commit is contained in:
@@ -44,7 +44,6 @@ import sys
|
||||
#-------------------------------------------------------------------------
|
||||
from gramps.gen.recentfiles import recent_files
|
||||
from gramps.gen.utils.file import rm_tempdir, get_empty_tempdir
|
||||
from gramps.gen.db import make_database
|
||||
from .clidbman import CLIDbManager, NAME_FILE, find_locker_name
|
||||
|
||||
from gramps.gen.plug import BasePluginManager
|
||||
@@ -492,7 +491,7 @@ class ArgHandler(object):
|
||||
else:
|
||||
self.imp_db_path = get_empty_tempdir("import_dbdir")
|
||||
|
||||
newdb = make_database("bsddb", self.dbstate)
|
||||
newdb = self.dbstate.make_database("bsddb")
|
||||
newdb.write_version(self.imp_db_path)
|
||||
|
||||
try:
|
||||
|
@@ -54,7 +54,6 @@ _LOG = logging.getLogger(DBLOGNAME)
|
||||
#-------------------------------------------------------------------------
|
||||
from gramps.gen.const import GRAMPS_LOCALE as glocale
|
||||
_ = glocale.translation.gettext
|
||||
from gramps.gen.db import make_database
|
||||
from gramps.gen.plug import BasePluginManager
|
||||
from gramps.gen.config import config
|
||||
from gramps.gen.constfunc import win, conv_to_unicode
|
||||
@@ -295,7 +294,7 @@ class CLIDbManager(object):
|
||||
if create_db:
|
||||
# write the version number into metadata
|
||||
|
||||
newdb = make_database("bsddb", self.dbstate)
|
||||
newdb = self.dbstate.make_database("bsddb")
|
||||
newdb.write_version(new_path)
|
||||
|
||||
(tval, last) = time_val(new_path)
|
||||
@@ -362,7 +361,7 @@ class CLIDbManager(object):
|
||||
# Create a new database
|
||||
self.__start_cursor(_("Importing data..."))
|
||||
|
||||
dbase = make_database("bsddb", self.dbstate)
|
||||
dbase = self.dbstate.make_database("bsddb")
|
||||
dbase.load(new_path, user.callback)
|
||||
|
||||
import_function = plugin.get_import_function()
|
||||
|
@@ -49,7 +49,6 @@ from gramps.gen.config import config
|
||||
from gramps.gen.const import PLUGINS_DIR, USER_PLUGINS
|
||||
from gramps.gen.errors import DbError
|
||||
from gramps.gen.dbstate import DbState
|
||||
from gramps.gen.db import make_database
|
||||
from gramps.gen.db.exceptions import (DbUpgradeRequiredError,
|
||||
BsddbDowngradeError,
|
||||
DbVersionError,
|
||||
@@ -152,7 +151,7 @@ class CLIDbLoader(object):
|
||||
else:
|
||||
mode = 'w'
|
||||
|
||||
db = make_database("bsddb", self.dbstate)
|
||||
db = self.dbstate.make_database("bsddb")
|
||||
|
||||
self.dbstate.change_database(db)
|
||||
self.dbstate.db.disable_signals()
|
||||
|
Reference in New Issue
Block a user