GEPS008: Moved config module

svn: r19809

src/Makefile.am

@@ -13,7 +13,6 @@ SUBDIRS = \
 gdirdir=$(prefix)/share/gramps
 
 gdir_PYTHON = \
-	config.py\
 	const.py\
         constfunc.py\
 	gramps.py\

src/Utils.py

@@ -63,7 +63,7 @@ from gen.ggettext import sgettext as _
 #-------------------------------------------------------------------------
 # cache values; use refresh_constants() if they change
 try:
-    import config
+    from gen.config import config
     _MAX_AGE_PROB_ALIVE   = config.get('behavior.max-age-prob-alive')
     _MAX_SIB_AGE_DIFF     = config.get('behavior.max-sib-age-diff')
     _AVG_GENERATION_GAP   = config.get('behavior.avg-generation-gap')
@@ -1357,7 +1357,7 @@ def update_constants():
     """
     Used to update the constants that are cached in this module.
     """
-    import config
+    from gen.config import config
     global _MAX_AGE_PROB_ALIVE, _MAX_SIB_AGE_DIFF, _AVG_GENERATION_GAP
     _MAX_AGE_PROB_ALIVE   = config.get('behavior.max-age-prob-alive')
     _MAX_SIB_AGE_DIFF     = config.get('behavior.max-sib-age-diff')

src/cli/argparser.py

@@ -47,7 +47,7 @@ import logging
 #
 #-------------------------------------------------------------------------
 import const
-import config
+from gen.config import config
 from gen.utils.configmanager import safe_eval
 import Utils
 

src/cli/clidbman.py

@@ -54,7 +54,7 @@ LOG = logging.getLogger(".clidbman")
 #-------------------------------------------------------------------------
 import gen.db
 from gen.plug import BasePluginManager
-import config
+from gen.config import config
 import constfunc
 #-------------------------------------------------------------------------
 #

src/cli/grampscli.py

@@ -46,7 +46,7 @@ LOG = logging.getLogger(".grampscli")
 #
 #-------------------------------------------------------------------------
 from gen.display.name import displayer as name_displayer
-import config
+from gen.config import config
 import const
 from gen.errors import DbError
 from gen.dbstate import DbState

src/gen/Makefile.am

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

src/gen/datehandler/__init__.py

@@ -62,7 +62,7 @@ except:
 
 # Initialize global displayer
 try:
-    import config
+    from gen.config import config
     val = config.get('preferences.date-format')
 except:
     val = 0

src/gen/db/bsddbtxn.py

@@ -188,7 +188,7 @@ class BSDDBTxn(object):
 # test code
 if __name__ == "__main__": 
     print "1"
-    import config
+    from gen.config import config
     if config.get('preferences.use-bsddb3'):
         from bsddb3 import db, dbshelve
     else:

src/gen/db/cursor.py

@@ -28,7 +28,7 @@
 #-------------------------------------------------------------------------
 from cPickle import dumps, loads
 
-import config
+from gen.config import config
 if config.get('preferences.use-bsddb3'):
     from bsddb3 import db
 else:

src/gen/db/dbconst.py

@@ -66,7 +66,7 @@ DBLOCKS   = 100000          # Maximum number of locks supported
 DBOBJECTS = 100000          # Maximum number of simultaneously locked objects
 DBUNDO    = 1000            # Maximum size of undo buffer
 
-import config
+from gen.config import config
 if config.get('preferences.use-bsddb3'):
     from bsddb3.db import DB_CREATE, DB_AUTO_COMMIT, DB_DUP, DB_DUPSORT, DB_RDONLY
 else:

src/gen/db/read.py

@@ -38,7 +38,7 @@ import locale
 import os
 from sys import maxint
 
-import config
+from gen.config import config
 if config.get('preferences.use-bsddb3'):
     from bsddb3 import db
 else:

src/gen/db/undoredo.py

@@ -36,7 +36,7 @@ import time, os
 import cPickle as pickle
 from collections import deque
 
-import config
+from gen.config import config
 if config.get('preferences.use-bsddb3'):
     from bsddb3 import db
 else:

src/gen/db/upgrade.py

@@ -34,7 +34,7 @@ from gen.ggettext import gettext as _
 """
 methods to upgrade a database from version 13 to current version
 """
-import config
+from gen.config import config
 if config.get('preferences.use-bsddb3'):
     from bsddb3 import db
 else:

src/gen/db/write.py

@@ -43,7 +43,7 @@ import logging
 from sys import maxint
 
 from gen.ggettext import gettext as _
-import config
+from gen.config import config
 if config.get('preferences.use-bsddb3'):
     from bsddb3 import dbshelve, db
 else:

src/gen/dbstate.py

@@ -28,7 +28,7 @@ Provide the database state class
 from gen.db import DbBsddbRead
 from gen.proxy.proxybase import ProxyDbBase
 from gen.utils import Callback
-import config
+from gen.config import config
 
 class DbState(Callback):
     """

src/gen/display/name.py

@@ -64,7 +64,7 @@ import re
 from gen.lib import Name, NameOriginType
 
 try:
-    import config
+    from gen.config import config
     WITH_GRAMPS_CONFIG=True
 except ImportError:
     WITH_GRAMPS_CONFIG=False

src/gen/lib/date.py

@@ -57,7 +57,7 @@ from gen.lib.calendar import (gregorian_sdn, julian_sdn, hebrew_sdn,
                               gregorian_ymd, julian_ymd, hebrew_ymd, 
                               french_ymd, persian_ymd, islamic_ymd,
                               swedish_ymd)
-import config
+from gen.config import config
 
 #-------------------------------------------------------------------------
 #

src/gen/lib/familyreltype.py

@@ -35,7 +35,7 @@ from gen.ggettext import gettext as _
 #
 #-------------------------------------------------------------------------
 from gen.lib.grampstype import GrampsType
-import config
+from gen.config import config
 
 class FamilyRelType(GrampsType):
 

src/gen/lib/test/date_test.py

@@ -45,7 +45,7 @@ except ValueError:
 from test import test_util
 test_util.path_append_parent() 
 
-import config
+from gen.config import config
 import gen.datehandler
 from gen.datehandler import parser as _dp
 from gen.datehandler import displayer as _dd

src/gen/plug/_gramplet.py

@@ -21,7 +21,7 @@
 
 # $Id$
 
-import config
+from gen.config import config
 if config.get('preferences.use-bsddb3'):
     import bsddb3 as bsddb
 else:

src/gen/plug/_manager.py

@@ -45,7 +45,7 @@ from gen.ggettext import gettext as _
 # GRAMPS modules
 #
 #-------------------------------------------------------------------------
-import config
+from gen.config import config
 import gen.utils
 from gen.plug import PluginRegister
 

src/gen/plug/report/_options.py

@@ -58,7 +58,7 @@ except:
 #
 #-------------------------------------------------------------------------
 import const
-import config
+from gen.config import config
 from gen.plug.docgen import PAPER_PORTRAIT
 from gen.plug import _options
 from gen.plug import MenuOptions

src/gen/proxy/living.py

@@ -39,7 +39,7 @@ from itertools import ifilter
 from proxybase import ProxyDbBase
 from gen.lib import Date, Person, Name, Surname
 from Utils import probably_alive
-import config
+from gen.config import config
 
 #-------------------------------------------------------------------------
 #

src/gen/relationship.py

@@ -401,7 +401,7 @@ class RelationshipCalculator(object):
         self.__db_connected = False
         self.depth = 15
         try:
-            import config
+            from gen.config import config
             self.set_depth(config.get('behavior.generation-depth'))
         except ImportError:
             pass

src/gen/simple/_simpleaccess.py

@@ -36,7 +36,7 @@ from gen.plug.report.utils import place_name
 
 from gen.display.name import displayer as name_displayer
 from gen.lib import EventType
-import config
+from gen.config import config
 from gen.ggettext import gettext as _
 
 #-------------------------------------------------------------------------

src/gen/simple/_simpletable.py

@@ -29,7 +29,7 @@ Provide a simplified table creation interface
 import cgi
 from gen.ggettext import sgettext as _
 import gen.lib
-import config
+from gen.config import config
 import gen.datehandler
 
 class SimpleTable(object):

src/gramps.py

@@ -251,7 +251,7 @@ def show_settings():
     except ImportError:
         pyexiv2_str = 'not found'
 
-    import config
+    from gen.config import config
     usebsddb3 = config.get('preferences.use-bsddb3')
     try:
         if usebsddb3:

src/gui/aboutdialog.py

@@ -53,7 +53,7 @@ import gtk
 #-------------------------------------------------------------------------
 import const
 from gui.display import display_url
-import config
+from gen.config import config
 
 if config.get('preferences.use-bsddb3'):
     import bsddb3 as bsddb

src/gui/clipboard.py

@@ -45,7 +45,7 @@ from gtk.gdk import ACTION_COPY, BUTTON1_MASK, ACTION_MOVE
 #
 #-------------------------------------------------------------------------
 import const
-import config
+from gen.config import config
 import gen.lib
 import gen.datehandler
 from gui.display import display_help

src/gui/configure.py

@@ -46,7 +46,7 @@ import gobject
 # gramps modules
 #
 #-------------------------------------------------------------------------
-import config
+from gen.config import config
 import const
 import gen.datehandler
 from gen.display.name import displayer as _nd

src/gui/dbloader.py

@@ -55,7 +55,7 @@ import gobject
 #
 #-------------------------------------------------------------------------
 from cli.grampscli import CLIDbLoader
-import config
+from gen.config import config
 import gen.db
 import Utils
 from gui.pluginmanager import GuiPluginManager

src/gui/dialog.py

@@ -41,7 +41,7 @@ from gtk.gdk import pixbuf_new_from_file
 #
 #-------------------------------------------------------------------------
 import const
-import config
+from gen.config import config
 from gui.glade import Glade
 from gen.ggettext import gettext as _
 

src/gui/display.py

@@ -22,7 +22,7 @@
 
 import const
 import constfunc
-import config
+from gen.config import config
 import locale
 import os
 

src/gui/displaystate.py

@@ -56,7 +56,7 @@ import gobject
 import gen.utils
 from gui.utils import process_pending_events
 from gui.views.navigationview import NavigationView
-import config
+from gen.config import config
 from gen.display.name import displayer as name_displayer
 from gui.managedwindow import GrampsWindowManager
 from gen.relationship import get_relationship_calculator

src/gui/editors/addmedia.py

@@ -51,7 +51,7 @@ import gtk
 #
 #-------------------------------------------------------------------------
 import const
-import config
+from gen.config import config
 import Utils
 import gen.mime
 from gui.thumbnails import find_mime_type_pixbuf

src/gui/editors/displaytabs/eventrefmodel.py

@@ -43,7 +43,7 @@ import cgi
 #
 #-------------------------------------------------------------------------
 import gen.datehandler
-import config
+from gen.config import config
 
 #-------------------------------------------------------------------------
 #

src/gui/editors/editfamily.py

@@ -28,7 +28,7 @@
 # python modules
 #
 #-------------------------------------------------------------------------
-import config
+from gen.config import config
 if config.get('preferences.use-bsddb3'):
     from bsddb3 import db as bsddb_db
 else:
@@ -61,7 +61,7 @@ import gobject
 #
 #-------------------------------------------------------------------------
 import Utils
-import config
+from gen.config import config
 from gen.display.name import displayer as name_displayer
 from gen.utils import get_marriage_or_fallback
 import gen.lib

src/gui/editors/editname.py

@@ -45,7 +45,7 @@ import gtk
 # gramps modules
 #
 #-------------------------------------------------------------------------
-import config
+from gen.config import config
 from gen.display.name import displayer as name_displayer
 from editsecondary import EditSecondary
 from gen.lib import NoteType

src/gui/editors/editnote.py

@@ -47,7 +47,7 @@ import pango
 # GRAMPS modules
 #
 #-------------------------------------------------------------------------
-import config
+from gen.config import config
 import const
 from editprimary import EditPrimary
 from displaytabs import GrampsTab, NoteBackRefList

src/gui/editors/editperson.py

@@ -63,7 +63,7 @@ from gui.glade import Glade
 from editprimary import EditPrimary
 from editmediaref import EditMediaRef
 from editname import EditName
-import config
+from gen.config import config
 from gui.dialog import ErrorDialog, ICON
 from gen.errors import ValidationError
 

src/gui/editors/editprimary.py

@@ -43,7 +43,7 @@ import gtk
 from gui.managedwindow import ManagedWindow
 import gen.datehandler
 from gen.display.name import displayer as name_displayer
-import config
+from gen.config import config
 import gui.utils
 from gui.display import display_help
 from gui.dialog import SaveDialog

src/gui/editors/editreference.py

@@ -35,7 +35,7 @@ import gtk
 #-------------------------------------------------------------------------
 from gui.managedwindow import ManagedWindow
 from displaytabs import GrampsTab
-import config
+from gen.config import config
 from gui.dbguielement import DbGUIElement
 
 #-------------------------------------------------------------------------

src/gui/editors/editsecondary.py

@@ -23,7 +23,7 @@
 
 from gui.managedwindow import ManagedWindow
 from gui.display import display_help
-import config
+from gen.config import config
 from gui.dbguielement import DbGUIElement
 
 class EditSecondary(ManagedWindow, DbGUIElement):

src/gui/filters/sidebar/_sidebarfilter.py

@@ -28,7 +28,7 @@ import pango
 
 from gui import widgets
 from gui.dbguielement import DbGUIElement
-import config
+from gen.config import config
 
 _RETURN = gtk.gdk.keyval_from_name("Return")
 _KP_ENTER = gtk.gdk.keyval_from_name("KP_Enter")

src/gui/grampsgui.py

@@ -56,7 +56,7 @@ import gobject
 # GRAMPS Modules
 #
 #-------------------------------------------------------------------------
-import config
+from gen.config import config
 import const
 import constfunc
 import Utils

src/gui/logger/_errorreportassistant.py

@@ -32,7 +32,7 @@ import gobject
 import cairo
 import sys, os
 
-import config
+from gen.config import config
 if config.get('preferences.use-bsddb3'):
     import bsddb3 as bsddb
 else:

src/gui/managedwindow.py

@@ -48,7 +48,7 @@ import gtk
 #-------------------------------------------------------------------------
 import const
 from gen.errors import WindowActiveError
-import config
+from gen.config import config
 from gui.glade import Glade
 
 #-------------------------------------------------------------------------

src/gui/plug/_windows.py

@@ -58,7 +58,7 @@ from gui.dialog import InfoDialog
 from gui.editors import EditPerson
 import Utils
 import const
-import config
+from gen.config import config
 
 def display_message(message):
     """

src/gui/plug/export/_exportassistant.py

@@ -56,7 +56,7 @@ import gtk
 #-------------------------------------------------------------------------
 
 import const
-import config
+from gen.config import config
 from gui.pluginmanager import GuiPluginManager
 import Utils
 from gui.managedwindow import ManagedWindow

src/gui/plug/export/_exportoptions.py

@@ -37,7 +37,7 @@
 #-------------------------------------------------------------------------
 from gen.ggettext import gettext as _
 from gen.ggettext import ngettext
-import config
+from gen.config import config
 from gen.display.name import displayer as name_displayer
 from gen.filters import GenericFilter, rules
 from gui.utils import ProgressMeter

src/gui/plug/report/_docreportdialog.py

@@ -42,7 +42,7 @@ import gtk
 #
 #-------------------------------------------------------------------------
 import const
-import config
+from gen.config import config
 from _reportdialog import ReportDialog
 from _papermenu import PaperFrame
 from gui.pluginmanager import GuiPluginManager

src/gui/plug/report/_graphvizreportdialog.py

@@ -45,7 +45,7 @@ import gobject
 # GRAMPS modules
 #
 #-------------------------------------------------------------------------------
-import config
+from gen.config import config
 from gen.plug.report import CATEGORY_GRAPHVIZ
 from _reportdialog import ReportDialog
 from _papermenu import PaperFrame

src/gui/plug/report/_reportdialog.py

@@ -49,7 +49,7 @@ import gtk
 #
 #-------------------------------------------------------------------------
 from gen.ggettext import gettext as _
-import config
+from gen.config import config
 from gen.errors import DatabaseError, FilterError, ReportError, WindowActiveError
 from gui.utils import open_file_with_default_application
 from gui.plug import add_gui_options

src/gui/pluginmanager.py

@@ -45,7 +45,7 @@ import gtk
 import gen.utils
 from gen.plug import BasePluginManager, PluginRegister
 from constfunc import win
-import config
+from gen.config import config
 import const
 
 #-------------------------------------------------------------------------

src/gui/spell.py

@@ -64,7 +64,7 @@ if not HAVE_GTKSPELL:
 # GRAMPS classes
 #
 #-------------------------------------------------------------------------
-import config
+from gen.config import config
 
 #-------------------------------------------------------------------------
 #

src/gui/tipofday.py

@@ -46,7 +46,7 @@ import os
 #
 #-------------------------------------------------------------------------
 import const
-import config
+from gen.config import config
 from gui.managedwindow import ManagedWindow
 from gui.dialog import ErrorDialog
 from gui.glade import Glade

src/gui/viewmanager.py

@@ -80,7 +80,7 @@ from gen.relationship import get_relationship_calculator
 from gui.displaystate import DisplayState, RecentDocsMenu
 import const
 import constfunc
-import config
+from gen.config import config
 from gen.errors import WindowActiveError
 from gui.dialog import (ErrorDialog, WarningDialog, QuestionDialog2,
                             InfoDialog)

src/gui/views/listview.py

@@ -53,7 +53,7 @@ import pango
 from gui.views.pageview import PageView
 from gui.views.navigationview import NavigationView
 from gui.columnorder import ColumnOrder
-import config
+from gen.config import config
 from gen.errors import WindowActiveError
 from gui.filters import SearchBar
 from gui.utils import add_menuitem

src/gui/views/pageview.py

@@ -51,7 +51,7 @@ from gui.dbguielement import DbGUIElement
 from gui.widgets.menutoolbuttonaction import MenuToolButtonAction
 from gui.grampsbar import GrampsBar
 from gui.configure import ConfigureDialog
-from config import config
+from gen.config import config
 
 #------------------------------------------------------------------------------
 #

src/gui/views/treemodels/citationbasemodel.py

@@ -42,7 +42,7 @@ LOG = logging.getLogger(".citation")
 import gen.datehandler
 import gen.lib
 from Utils import confidence, format_time
-import config
+from gen.config import config
 
 #-------------------------------------------------------------------------
 #

src/gui/views/treemodels/eventmodel.py

@@ -43,7 +43,7 @@ import gtk
 import gen.datehandler
 import gen.lib
 import Utils
-import config
+from gen.config import config
 from gui.views.treemodels.flatbasemodel import FlatBaseModel
 
 #-------------------------------------------------------------------------

src/gui/views/treemodels/familymodel.py

@@ -47,7 +47,7 @@ from gen.display.name import displayer as name_displayer
 import gen.lib
 from gen.lib import EventRoleType
 from gui.views.treemodels.flatbasemodel import FlatBaseModel
-import config
+from gen.config import config
 
 invalid_date_format = config.get('preferences.invalid-date-format')
 

src/gui/views/treemodels/peoplemodel.py

@@ -63,7 +63,7 @@ import Utils
 from lru import LRU
 from gui.views.treemodels.flatbasemodel import FlatBaseModel
 from gui.views.treemodels.treebasemodel import TreeBaseModel
-import config
+from gen.config import config
 
 #-------------------------------------------------------------------------
 #

src/gui/widgets/styledtexteditor.py

@@ -59,7 +59,7 @@ from gui.widgets.toolcomboentry import ToolComboEntry
 from gui.widgets.springseparator import SpringSeparatorAction
 from gui.spell import Spell
 from gui.display import display_url
-import config
+from gen.config import config
 from constfunc import has_display
 
 #-------------------------------------------------------------------------

src/guiQML/grampsqml.py

@@ -44,7 +44,7 @@ LOG = logging.getLogger(".grampsqml")
 #
 #-------------------------------------------------------------------------
 import constfunc
-import config
+from gen.config import config
 
 #-------------------------------------------------------------------------
 #

src/plugins/drawreport/FanChart.py

@@ -48,7 +48,7 @@ from gen.plug.menu import EnumeratedListOption, NumberOption, PersonOption
 from gen.plug.report import Report
 from gen.plug.report import utils as ReportUtils
 from gen.plug.report import MenuReportOptions
-import config
+from gen.config import config
 
 #------------------------------------------------------------------------
 #

src/plugins/drawreport/TimeLine.py

@@ -47,7 +47,7 @@ from gen.plug.docgen import (FontStyle, ParagraphStyle, GraphicsStyle,
                     FONT_SANS_SERIF, DASHED, PARA_ALIGN_CENTER)
 from gen.sort import Sort
 from gen.display.name import displayer as name_displayer
-import config
+from gen.config import config
 from gen.utils import get_birth_or_fallback, get_death_or_fallback
 
 #------------------------------------------------------------------------

src/plugins/export/ExportGeneWeb.py

@@ -51,7 +51,7 @@ from gui.plug.export import WriterOptionBox
 #import const
 import Utils
 from gui.glade import Glade
-import config
+from gen.config import config
 
 class GeneWebWriter(object):
     def __init__(self, database, filename, user, option_box=None):

src/plugins/gramplet/Events.py

@@ -28,7 +28,7 @@ import gen.datehandler
 from gen.utils import get_birth_or_fallback, get_marriage_or_fallback
 from gen.errors import WindowActiveError
 import gtk
-import config
+from gen.config import config
 
 age_precision = config.get('preferences.age-display-precision')
 

src/plugins/gramplet/GivenNameGramplet.py

@@ -24,7 +24,7 @@ from collections import defaultdict
 from gen.ggettext import gettext as _
 
 from gen.plug import Gramplet
-import config
+from gen.config import config
 
 _YIELD_INTERVAL = 350
 

src/plugins/gramplet/SurnameCloudGramplet.py

@@ -27,7 +27,7 @@ from collections import defaultdict
 #------------------------------------------------------------------------
 from gen.plug import Gramplet
 from gen.ggettext import sgettext as _
-import config
+from gen.config import config
 
 #------------------------------------------------------------------------
 #

src/plugins/gramplet/TopSurnamesGramplet.py

@@ -27,7 +27,7 @@ from collections import defaultdict
 #------------------------------------------------------------------------
 from gen.plug import Gramplet
 from gen.ggettext import sgettext as _
-import config
+from gen.config import config
 
 #------------------------------------------------------------------------
 #

src/plugins/import/ImportGedcom.py

@@ -50,7 +50,7 @@ import libgedcom
 module = __import__("libgedcom")
 reload (module)
 
-import config
+from gen.config import config
     
 #-------------------------------------------------------------------------
 #

src/plugins/lib/libgrdb.py

@@ -36,7 +36,7 @@ import random
 import locale
 import os
 from sys import maxint
-import config
+from gen.config import config
 if config.get('preferences.use-bsddb3'):
     from bsddb3 import db
 else:

src/plugins/lib/libpersonview.py

@@ -55,7 +55,7 @@ from gen.display.name import displayer as name_displayer
 from gui.dialog import ErrorDialog, QuestionDialog
 from gen.errors import WindowActiveError
 from gui.views.bookmarks import PersonBookmarks
-import config
+from gen.config import config
 from gui.ddtargets import DdTargets
 from gui.editors import EditPerson
 from gui.filters.sidebar import PersonSidebarFilter

src/plugins/lib/libplaceview.py

@@ -50,7 +50,7 @@ from gui.views.listview import ListView
 from gui.utils import add_menuitem
 from gen.errors import WindowActiveError
 from gui.views.bookmarks import PlaceBookmarks
-import config
+from gen.config import config
 from gui.dialog import ErrorDialog
 from gui.pluginmanager import GuiPluginManager
 from gui.ddtargets import DdTargets

src/plugins/lib/libtranslate.py

@@ -39,7 +39,7 @@ _ = gettext.gettext
 #------------------------------------------------------------------------
 import TransUtils
 import gen.datehandler
-import config
+from gen.config import config
 from gen.lib.grampstype import GrampsType
 
 #------------------------------------------------------------------------

src/plugins/lib/maps/geography.py

@@ -54,7 +54,7 @@ from gen.errors import WindowActiveError
 import const
 import constfunc
 from gui.managedwindow import ManagedWindow
-from config import config
+from gen.config import config
 from gui.editors import EditPlace, EditEvent, EditFamily, EditPerson
 from gui.selectors.selectplace import SelectPlace
 

src/plugins/lib/maps/osmGps.py

@@ -58,7 +58,7 @@ from selectionlayer import SelectionLayer
 from lifewaylayer import LifeWayLayer
 from datelayer import DateLayer
 from gen.ggettext import sgettext as _
-from config import config
+from gen.config import config
 from gui.dialog import ErrorDialog
 
 #-------------------------------------------------------------------------

src/plugins/quickview/AgeOnDate.py

@@ -33,7 +33,7 @@ from Utils import probably_alive
 from gen.ggettext import gettext as _
 import gen.datehandler
 import gen.lib
-import config
+from gen.config import config
 
 def run(database, document, date):
     """

src/plugins/sidebar/categorysidebar.py

@@ -35,7 +35,7 @@ import gtk
 # GRAMPS modules
 #
 #-------------------------------------------------------------------------
-import config
+from gen.config import config
 from gui.basesidebar import BaseSidebar
 from gui.viewmanager import get_available_views, views_to_show
 

src/plugins/tool/Check.py

@@ -64,7 +64,7 @@ import gtk
 #-------------------------------------------------------------------------
 import gen.lib
 from gen.db import DbTxn
-import config
+from gen.config import config
 import Utils
 from gui.utils import ProgressMeter
 from gui.managedwindow import ManagedWindow

src/plugins/tool/Leak.py

@@ -32,7 +32,7 @@ Show uncollected objects in a window.
 #
 #------------------------------------------------------------------------
 from gen.ggettext import gettext as _
-import config
+from gen.config import config
 if config.get('preferences.use-bsddb3'):
     from bsddb3.db import DBError
 else:

src/plugins/tool/OwnerEditor.py

@@ -38,7 +38,7 @@ import gtk
 #
 #-------------------------------------------------------------------------
 import const
-import config
+from gen.config import config
 from Utils import get_researcher
 from gui.display import display_help
 from gui.widgets import MonitoredEntry

src/plugins/view/eventview.py

@@ -52,7 +52,7 @@ from gui.views.treemodels import EventModel
 import Utils
 from gen.errors import WindowActiveError
 from gui.views.bookmarks import EventBookmarks
-import config
+from gen.config import config
 from gui.ddtargets import DdTargets
 from gui.dialog import ErrorDialog
 from gui.editors import EditEvent, DeleteEventQuery

src/plugins/view/familyview.py

@@ -51,7 +51,7 @@ from gui.views.treemodels import FamilyModel
 from gui.editors import EditFamily
 from gui.views.bookmarks import FamilyBookmarks
 from gen.errors import WindowActiveError
-import config
+from gen.config import config
 from gui.dialog import ErrorDialog
 from gui.filters.sidebar import FamilySidebarFilter
 from gui.merge import MergeFamily

src/plugins/view/geoclose.py

@@ -49,7 +49,7 @@ _LOG = logging.getLogger("GeoGraphy.geoclose")
 #
 #-------------------------------------------------------------------------
 import gen.lib
-import config
+from gen.config import config
 import gen.datehandler
 from gen.display.name import displayer as _nd
 from gen.utils import conv_lat_lon

src/plugins/view/geoevents.py

@@ -56,7 +56,7 @@ _LOG = logging.getLogger("GeoGraphy.geoevents")
 #-------------------------------------------------------------------------
 import gen.lib
 import Utils
-import config
+from gen.config import config
 import gen.datehandler
 from gen.display.name import displayer as _nd
 from gen.utils import conv_lat_lon

src/plugins/view/geofamclose.py

@@ -49,7 +49,7 @@ _LOG = logging.getLogger("GeoGraphy.geofamilyclose")
 #
 #-------------------------------------------------------------------------
 import gen.lib
-import config
+from gen.config import config
 import gen.datehandler
 from gen.display.name import displayer as _nd
 from gen.utils import conv_lat_lon

src/plugins/view/geofamily.py

@@ -56,7 +56,7 @@ _LOG = logging.getLogger("GeoGraphy.geofamily")
 #-------------------------------------------------------------------------
 import gen.lib
 import Utils
-import config
+from gen.config import config
 import gen.datehandler
 from gen.display.name import displayer as _nd
 from gen.utils import conv_lat_lon

src/plugins/view/geomoves.py

@@ -52,7 +52,7 @@ _LOG = logging.getLogger("GeoGraphy.geomoves")
 #
 #-------------------------------------------------------------------------
 import gen.lib
-import config
+from gen.config import config
 import gen.datehandler
 from gen.display.name import displayer as _nd
 from gen.utils import conv_lat_lon

src/plugins/view/geoperson.py

@@ -57,7 +57,7 @@ _LOG = logging.getLogger("GeoGraphy.geoperson")
 #-------------------------------------------------------------------------
 import gen.lib
 import Utils
-import config
+from gen.config import config
 import gen.datehandler
 from gen.display.name import displayer as _nd
 from gen.utils import conv_lat_lon

src/plugins/view/geoplaces.py

@@ -57,7 +57,7 @@ _LOG = logging.getLogger("GeoGraphy.geoplaces")
 #-------------------------------------------------------------------------
 import gen.lib
 import Utils
-import config
+from gen.config import config
 from gen.display.name import displayer as _nd
 from gen.utils import conv_lat_lon
 from gui.views.pageview import PageView

src/plugins/view/htmlrenderer.py

@@ -61,7 +61,7 @@ from gui.views.navigationview import NavigationView
 from gui.views.bookmarks import PersonBookmarks
 import Utils
 import constfunc
-import config
+from gen.config import config
 from const import TEMP_DIR
 
 #-------------------------------------------------------------------------

src/plugins/view/mediaview.py

@@ -54,7 +54,7 @@ from gui.views.listview import ListView
 from gui.views.treemodels import MediaModel
 import const
 import constfunc
-import config
+from gen.config import config
 import Utils
 from gui.views.bookmarks import MediaBookmarks
 import gen.mime

src/plugins/view/noteview.py

@@ -50,7 +50,7 @@ from gui.views.treemodels import NoteModel
 import Utils
 from gen.errors import WindowActiveError
 from gui.views.bookmarks import NoteBookmarks
-import config
+from gen.config import config
 from gen.lib import Note
 from gui.ddtargets import DdTargets
 from gui.dialog import ErrorDialog

src/plugins/view/pedigreeview.py

@@ -59,7 +59,7 @@ from gen.errors import WindowActiveError
 from gui.editors import EditPerson, EditFamily
 from gui.ddtargets import DdTargets
 import cPickle as pickle
-import config
+from gen.config import config
 from gui.views.bookmarks import PersonBookmarks
 import const
 import constfunc

src/plugins/view/relview.py

@@ -56,7 +56,7 @@ from Utils import media_path_full, probably_alive
 from gui.utils import open_file_with_default_application
 import gen.datehandler
 from gui.thumbnails import get_thumbnail_image
-import config
+from gen.config import config
 from gui import widgets
 from gui.selectors import SelectorFactory
 from gen.errors import WindowActiveError

src/plugins/view/repoview.py

@@ -41,7 +41,7 @@ from gui.views.listview import ListView
 from gui.views.treemodels import RepositoryModel
 from gui.views.bookmarks import RepoBookmarks
 from gen.errors import WindowActiveError
-import config
+from gen.config import config
 from gui.editors import EditRepository, DeleteRepositoryQuery
 from gui.ddtargets import DdTargets
 from gui.dialog import ErrorDialog