GEPS008: Moved DbState module

svn: r19784

src/ExportOptions.py

@@ -216,7 +216,7 @@ class WriterOptionBox(object):
         return widget
 
     def show_preview_data(self, widget):
-        from DbState import DbState
+        from gen.dbstate import DbState
         from gui.plug.quick import run_quick_report_by_name
         if widget.proxy_name == "unfiltered":
             dbstate = self.dbstate

src/Makefile.am

@@ -18,7 +18,6 @@ gdir_PYTHON = \
 	const.py\
         constfunc.py\
 	DateEdit.py\
-	DbState.py\
 	Errors.py\
 	ExportAssistant.py\
 	ExportOptions.py\

src/cli/grampscli.py

@@ -49,7 +49,7 @@ from gen.display.name import displayer as name_displayer
 import config
 import const
 import Errors
-import DbState
+from gen.dbstate import DbState
 from gen.db import DbBsddb
 import gen.db.exceptions
 from gen.plug import BasePluginManager
@@ -313,7 +313,7 @@ def startcli(errors, argparser):
         sys.exit(1)
     
     #we need to keep track of the db state
-    dbstate = DbState.DbState()
+    dbstate = DbState()
     #we need a manager for the CLI session
     climanager = CLIManager(dbstate, True)
     #load the plugins

src/cli/plug/__init__.py

@@ -60,7 +60,7 @@ from gen.plug.report import (CATEGORY_TEXT, CATEGORY_DRAW, CATEGORY_BOOK,
                              CATEGORY_GRAPHVIZ, CATEGORY_CODE)
 from gen.plug.report._paper import paper_sizes
 import const
-import DbState
+from gen.dbstate import DbState
 from cli.grampscli import CLIManager
 import cli.user
 
@@ -627,7 +627,7 @@ def run_report(db, name, **options_str_dict):
        options and values used in  clr.option_class.options_dict
        filename in clr.option_class.get_output()
     """
-    dbstate = DbState.DbState()
+    dbstate = DbState()
     climanager = CLIManager(dbstate, False) # don't load db
     climanager.do_reg_plugins(dbstate, None)
     pmgr = BasePluginManager.get_instance()

src/gen/Makefile.am

@@ -22,6 +22,7 @@ pkgpythondir = $(datadir)/@PACKAGE@/gen
 
 pkgpython_PYTHON = \
 	__init__.py \
+	dbstate.py \
 	ggettext.py \
 	updatecallback.py \
 	user.py

src/gui/grampsgui.py

@@ -205,14 +205,14 @@ class Gramps(object):
     """
 
     def __init__(self, argparser):
-        import DbState
+        from gen.dbstate import DbState
         from viewmanager import ViewManager
         from cli.arghandler import ArgHandler
         from gui.tipofday import TipOfDay
 
         register_stock_icons()
 
-        dbstate = DbState.DbState()
+        dbstate = DbState()
         self.vm = ViewManager(dbstate, config.get("interface.view-categories"))
         self.vm.init_interface()
 

src/guiQML/grampsqml.py

@@ -60,13 +60,13 @@ class GrampsQML(object):
     """
 
     def __init__(self, argparser):
-        import DbState
+        from gen.dbstate import DbState
         from guiQML.viewmanager import ViewManager
         from cli.arghandler import ArgHandler
 
         from PySide import QtGui
         self.app = QtGui.QApplication(sys.argv)
-        dbstate = DbState.DbState()
+        dbstate = DbState()
         self.vm = ViewManager(dbstate)
 
         #act based on the given arguments

src/webapp/reports.py

@@ -23,7 +23,7 @@
 
 # imports for import/export:
 
-import DbState
+from gen.dbstate import DbState
 from cli.grampscli import CLIManager
 from gen.plug import BasePluginManager
 import os
@@ -48,7 +48,7 @@ def import_file(db, filename, user):
     >>> import_file(DbDjango(), "/home/user/Untitled_1.ged", User())
     """
     from grampsdb.models import Person
-    dbstate = DbState.DbState()
+    dbstate = DbState()
     climanager = CLIManager(dbstate, False) # do not load db_loader
     climanager.do_reg_plugins(dbstate, None)
     pmgr = BasePluginManager.get_instance()
@@ -108,7 +108,7 @@ def export_file(db, filename, user):
 
     >>> export_file(DbDjango(), "/home/user/Untitled_1.ged", User())
     """
-    dbstate = DbState.DbState()
+    dbstate = DbState()
     climanager = CLIManager(dbstate, False) # do not load db_loader
     climanager.do_reg_plugins(dbstate, None)
     pmgr = BasePluginManager.get_instance()

src/webapp/utils.py

@@ -58,7 +58,7 @@ from webapp.dbdjango import DbDjango
 #------------------------------------------------------------------------
 from gen.simple import SimpleTable, SimpleAccess, make_basic_stylesheet
 import Utils
-import DbState
+from gen.dbstate import DbState
 from gen.datehandler import displayer, parser
 from gen.lib.date import Date as GDate, Today
 import gen.lib
@@ -118,7 +118,7 @@ dp = parser.parse
 db = DbDjango()
 
 def register_plugins():
-    dbstate = DbState.DbState()
+    dbstate = DbState()
     climanager = CLIManager(dbstate, False) # don't load db
     climanager.do_reg_plugins(dbstate, None)
     pmgr = BasePluginManager.get_instance()