Continued work on GEP008: Move src/BasicUtils/_NameDisplay.py to src/gen/display.

svn: r14072

po/POTFILES.in

@@ -54,6 +54,9 @@ src/cli/grampscli.py
 src/gen/__init__.py
 src/gen/updatecallback.py
 
+# gen display API
+src/gen/display/name.py
+
 # gen utils API
 src/gen/utils/__init__.py
 src/gen/utils/callback.py
@@ -303,9 +306,6 @@ src/gui/widgets/validatedmaskedentry.py
 # Simple API
 src/Simple/_SimpleTable.py
 
-# BasicUtils package
-src/BasicUtils/_NameDisplay.py
-
 # Config package
 src/config.py
 

src/Bookmarks.py

@@ -51,7 +51,6 @@ import gtk
 #
 #-------------------------------------------------------------------------
 import GrampsDisplay
-from BasicUtils import name_displayer
 import ListModel
 import Utils
 import const

src/DisplayState.py

@@ -56,8 +56,7 @@ import gen.utils
 from gui.utils import process_pending_events
 from gui.views.navigationview import NavigationView
 import config
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
-import const
 import ManagedWindow
 import Relationship
 from glade import Glade

src/Errors.py

@@ -142,14 +142,3 @@ class DbError(Exception):
     def __str__(self):
         "Return string representation"
         return self.value
-
-class NameDisplayError(Exception):
-    """
-    Error used to report that the name display format string is invalid.
-    """
-    def __init__(self, value):
-        Exception.__init__(self)
-        self.value = value
-
-    def __str__(self):
-        return self.value

src/ExportOptions.py

@@ -38,7 +38,7 @@ import gobject
 #-------------------------------------------------------------------------
 import config
 
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 from Filters import GenericFilter, Rules
 
 #-------------------------------------------------------------------------

src/FilterEditor/_EditRule.py

@@ -60,7 +60,7 @@ import gen.lib
 from Filters import Rules
 import AutoComp
 from gui.selectors import SelectorFactory
-from BasicUtils import name_displayer as _nd
+from gen.display.name import displayer as _nd
 import Utils
 import ManagedWindow
 

src/FilterEditor/_ShowResults.py

@@ -55,7 +55,7 @@ import gobject
 #-------------------------------------------------------------------------
 import const
 import ManagedWindow
-from BasicUtils import name_displayer as _nd
+from gen.display.name import displayer as _nd
 import Utils
 
 #-------------------------------------------------------------------------

src/GrampsCfg.py

@@ -47,13 +47,13 @@ import gobject
 import config
 import const
 import DateHandler
-from BasicUtils import name_displayer as _nd
+from gen.display.name import displayer as _nd
+from gen.display.name import NameDisplayError
 import Utils
 from gen.lib import Name
 import ManagedWindow
 from gui.widgets import MarkupLabel, BasicLabel
 from QuestionDialog import ErrorDialog, QuestionDialog2, OkDialog
-from Errors import NameDisplayError
 from glade import Glade
 
 #-------------------------------------------------------------------------

src/Merge/_MergePerson.py

@@ -36,13 +36,12 @@ import pango
 from TransUtils import sgettext as _
 import gen.lib
 from ReportBase import ReportUtils
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 import const
 import DateHandler
 from QuestionDialog import ErrorDialog
 import GrampsDisplay
 import ManagedWindow
-import gen.utils
 from glade import Glade
 
 #-------------------------------------------------------------------------

src/PluginUtils/_GuiOptions.py

@@ -54,7 +54,7 @@ from gui import widgets
 import ManagedWindow
 from QuestionDialog import OptionDialog
 from gui.selectors import SelectorFactory
-from BasicUtils import name_displayer as _nd
+from gen.display.name import displayer as _nd
 from Filters import GenericFilterFactory, GenericFilter, Rules
 import gen
 

src/PluginUtils/_Tool.py

@@ -39,7 +39,7 @@ log = logging.getLogger(".")
 #-------------------------------------------------------------------------
 import const
 import Utils
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 import Errors
 from PluginUtils import (Options, OptionHandler, OptionList, 
                          OptionListCollection)

src/Reorder.py

@@ -17,11 +17,19 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-
+#-------------------------------------------------------------------------
+#
+# Standard python modules
+#
+#-------------------------------------------------------------------------
 from gettext import gettext as _
 
-import const
+#-------------------------------------------------------------------------
-from BasicUtils import name_displayer
+#
+# gramps modules
+#
+#-------------------------------------------------------------------------
+from gen.display.name import displayer as name_displayer
 import ListModel
 import ManagedWindow
 from glade import Glade

src/ReportBase/_CommandLineReport.py

@@ -50,7 +50,7 @@ from gen.plug.menu import (FamilyOption, PersonOption, NoteOption,
                            MediaOption, PersonListOption, NumberOption, 
                            BooleanOption, DestinationOption, StringOption, 
                            TextOption, EnumeratedListOption)
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 from Errors import ReportError
 from ReportBase import (CATEGORY_TEXT, CATEGORY_DRAW, CATEGORY_BOOK,
                         CATEGORY_GRAPHVIZ, CATEGORY_CODE)

src/ReportBase/_ReportUtils.py

@@ -246,7 +246,7 @@ def get_person_filters(person, include_single=True):
     @type person: boolean
     """
     from Filters import GenericFilter, Rules, CustomFilters
-    from BasicUtils import name_displayer
+    from gen.display.name import displayer as name_displayer
 
     if person:
         name = name_displayer.display(person)

src/Simple/_SimpleAccess.py

@@ -28,7 +28,7 @@ import gen.lib
 import DateHandler
 import Utils
 
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 from gen.lib import EventType
 import config
 

src/SubstKeywords.py

@@ -37,8 +37,7 @@ Mary Smith was born on 3/28/1923.
 # Gramps modules
 #
 #------------------------------------------------------------------------
-
+from gen.display.name import displayer as name_displayer
-from BasicUtils import name_displayer
 import DateHandler
 import gen.lib
 from gen.utils import get_birth_or_fallback, get_death_or_fallback

src/Utils.py

@@ -44,7 +44,7 @@ import uuid
 # Gramps modules
 #
 #-------------------------------------------------------------------------
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 import gen.lib
 import Errors
 from GrampsLocale import codeset

src/cli/grampscli.py

@@ -45,7 +45,7 @@ LOG = logging.getLogger(".grampscli")
 # GRAMPS  modules
 #
 #-------------------------------------------------------------------------
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 import config
 import const
 import Errors

src/gen/Makefile.am

@@ -4,10 +4,11 @@
 # If not using GNU make, then list all .py files individually
 
 SUBDIRS = \
-	plug \
+	display \
-	proxy\
+	db \
-	db\
 	lib\
+	plug \
+	proxy \
 	utils
 
 pkgdatadir = $(datadir)/@PACKAGE@/gen

src/gen/display/Makefile.am

@@ -1,16 +1,16 @@
-# This is the src/BasicUtils level Makefile for Gramps
+# This is the src/gen/display level Makefile for Gramps
 # We could use GNU make's ':=' syntax for nice wildcard use,
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually
 
-pkgdatadir = $(datadir)/@PACKAGE@/BasicUtils
+pkgdatadir = $(datadir)/@PACKAGE@/display
 
 pkgdata_PYTHON = \
-	_NameDisplay.py\
+	name.py\
 	__init__.py
 
-pkgpyexecdir = @pkgpyexecdir@/BasicUtils
+pkgpyexecdir = @pkgpyexecdir@/display
-pkgpythondir = @pkgpythondir@/BasicUtils
+pkgpythondir = @pkgpythondir@/display
 
 
 dist_pkgdata_DATA = 

src/gen/display/__init__.py

@@ -2,6 +2,7 @@
 # Gramps - a GTK+/GNOME based genealogy program
 #
 # Copyright (C) 2004-2007 Donald N. Allingham
+# Copyright (C) 2010      Brian G. Matherly
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,4 +21,3 @@
 
 # $Id: __init__.py$
 
-from _NameDisplay import displayer as name_displayer

src/gen/display/name.py

@@ -2,6 +2,7 @@
 # Gramps - a GTK+/GNOME based genealogy program
 #
 # Copyright (C) 2004-2007  Donald N. Allingham
+# Copyright (C) 2010       Brian G. Matherly
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -38,7 +39,6 @@ import re
 #
 #-------------------------------------------------------------------------
 from gen.lib import Name
-from Errors import NameDisplayError
 
 try:
     import config
@@ -81,6 +81,22 @@ _F_RAWFN = 4 # name format raw function
 # Because of occurring in an exec(), this couldn't be in a lambda:
 def _make_cmp(a, b): return -cmp(a[1], b[1])
 
+#-------------------------------------------------------------------------
+#
+# NameDisplayError class
+#
+#-------------------------------------------------------------------------
+class NameDisplayError(Exception):
+    """
+    Error used to report that the name display format string is invalid.
+    """
+    def __init__(self, value):
+        Exception.__init__(self)
+        self.value = value
+
+    def __str__(self):
+        return self.value
+
 #-------------------------------------------------------------------------
 #
 # NameDisplay class
@@ -94,11 +110,6 @@ class NameDisplay(object):
     format_funcs = {}
     raw_format_funcs = {}
 
-    # FIXME: Is this used anywhere? I cannot see that it is.
-    sort_field = (Name.get_surname, Name.get_surname,
-                  Name.get_first_name, Name.get_patronymic,
-                  Name.get_first_name)
-
     STANDARD_FORMATS = [
         (Name.DEF,_("Default format (defined by Gramps preferences)"),'',_ACT),
         (Name.LNFN,_("Surname, Given Patronymic"),'%p %l, %f %y %s',_ACT),

src/gui/editors/displaytabs/backrefmodel.py

@@ -35,7 +35,7 @@ from gettext import gettext as _
 # GRAMPS classes
 #
 #-------------------------------------------------------------------------
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 import Utils
 
 #-------------------------------------------------------------------------

src/gui/editors/displaytabs/childmodel.py

@@ -34,7 +34,7 @@ import cgi
 #
 #-------------------------------------------------------------------------
 import DateHandler
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 import Utils
 import gen.lib
 from gen.utils import get_birth_or_fallback

src/gui/editors/displaytabs/namemodel.py

@@ -41,7 +41,7 @@ from pango import WEIGHT_NORMAL, WEIGHT_BOLD
 # GRAMPS classes
 #
 #-------------------------------------------------------------------------
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 
 #-------------------------------------------------------------------------
 #

src/gui/editors/displaytabs/personeventembedlist.py

@@ -34,7 +34,7 @@ from gettext import gettext as _
 #
 #-------------------------------------------------------------------------
 import gen.lib
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 from eventembedlist import EventEmbedList
 from eventrefmodel import EventRefModel
 

src/gui/editors/displaytabs/personrefmodel.py

@@ -32,7 +32,7 @@ import gtk
 # GRAMPS classes
 #
 #-------------------------------------------------------------------------
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 
 #-------------------------------------------------------------------------
 #

src/gui/editors/editchildref.py

@@ -51,7 +51,7 @@ import Errors
 from glade import Glade
 from displaytabs import SourceEmbedList, NoteTab
 from gui.widgets import MonitoredDataType, PrivacyButton
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 
 #-------------------------------------------------------------------------
 #

src/gui/editors/editfamily.py

@@ -55,7 +55,7 @@ import pango
 #-------------------------------------------------------------------------
 import Utils
 import config
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 import gen.lib
 import Errors
 import DateHandler

src/gui/editors/editldsord.py

@@ -45,7 +45,7 @@ import gtk
 #
 #-------------------------------------------------------------------------
 import gen.lib
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 import LdsUtils
 from glade import Glade
 from editsecondary import EditSecondary

src/gui/editors/editname.py

@@ -41,7 +41,7 @@ import gtk
 # gramps modules
 #
 #-------------------------------------------------------------------------
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 from editsecondary import EditSecondary
 from gen.lib import NoteType
 from displaytabs import GrampsTab,SourceEmbedList,NoteTab

src/gui/editors/editperson.py

@@ -46,13 +46,11 @@ import gtk
 # gramps modules
 #
 #-------------------------------------------------------------------------
-import const
 import Utils
 from gui.utils import add_menuitem, open_file_with_default_application
-import Mime
 import gen.lib
 from gui import widgets
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 import Errors
 from glade import Glade
 

src/gui/editors/editpersonref.py

@@ -45,7 +45,7 @@ import gtk
 # gramps modules
 #
 #-------------------------------------------------------------------------
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 from editsecondary import EditSecondary
 from gen.lib import NoteType
 from gui.widgets import MonitoredEntry, PrivacyButton

src/gui/editors/editprimary.py

@@ -42,7 +42,7 @@ import gtk
 #-------------------------------------------------------------------------
 import ManagedWindow
 import DateHandler
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 import config
 import GrampsDisplay
 from QuestionDialog import SaveDialog

src/gui/viewmanager.py

@@ -71,7 +71,6 @@ import GrampsCfg
 import Errors
 from QuestionDialog import (ErrorDialog, WarningDialog, QuestionDialog2, 
                             InfoDialog)
-from BasicUtils import name_displayer
 from gui import widgets
 import UndoHistory
 from gui.dbloader import DbLoader

src/gui/views/navigationview.py

@@ -219,7 +219,7 @@ class NavigationView(PageView):
         """
         Add a bookmark to the list.
         """
-        from BasicUtils import name_displayer
+        from gen.display.name import displayer as name_displayer
 
         active_handle = self.uistate.get_active('Person')
         active_person = self.dbstate.db.get_person_from_handle(active_handle)

src/gui/views/treemodels/familymodel.py

@@ -44,10 +44,9 @@ import const
 import ToolTips
 import GrampsLocale
 import DateHandler
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 import gen.lib
 from gen.lib import EventRoleType
-import gen.utils
 
 from gui.views.treemodels.flatbasemodel import FlatBaseModel
 

src/gui/views/treemodels/peoplemodel.py

@@ -60,7 +60,7 @@ _LOG = logging.getLogger(".")
 #-------------------------------------------------------------------------
 import const
 from gen.lib import Name, EventRef, EventType, EventRoleType, MarkerType
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 import DateHandler
 import ToolTips
 import GrampsLocale

src/plugins/BookReport.py

@@ -83,7 +83,7 @@ from ReportBase._DocReportDialog import DocReportDialog
 from ReportBase._CommandLineReport import CommandLineReport
 from ReportBase._ReportOptions import ReportOptions
 
-from BasicUtils import name_displayer as _nd
+from gen.display.name import displayer as _nd
 
 #------------------------------------------------------------------------
 #

src/plugins/Records.py

@@ -34,10 +34,9 @@ from TransUtils import sgettext as _
 # GRAMPS modules
 #
 #------------------------------------------------------------------------
-import gen.lib
 from gen.lib import ChildRefType, Date, Name
 from gen.plug.docgen import FontStyle, ParagraphStyle, FONT_SANS_SERIF
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 from gen.plug import Gramplet
 from gen.plug.menu import (BooleanOption, EnumeratedListOption, 
                            FilterOption, PersonOption)

src/plugins/drawreport/AncestorTree.py

@@ -35,7 +35,7 @@ from TransUtils import sgettext as _
 # GRAMPS modules
 #
 #------------------------------------------------------------------------
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 from Errors import ReportError
 from gen.plug.docgen import (FontStyle, ParagraphStyle, GraphicsStyle,
                             FONT_SANS_SERIF, PARA_ALIGN_CENTER)

src/plugins/drawreport/Calendar.py

@@ -34,7 +34,7 @@ import time
 # GRAMPS modules
 #
 #------------------------------------------------------------------------
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 from Errors import ReportError
 import Relationship
 from gen.plug.docgen import (FontStyle, ParagraphStyle, GraphicsStyle,

src/plugins/drawreport/DescendTree.py

@@ -29,7 +29,7 @@
 # GRAMPS modules
 #
 #------------------------------------------------------------------------
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 from Errors import ReportError
 from gen.plug.docgen import (GraphicsStyle, FontStyle, ParagraphStyle,
                             FONT_SANS_SERIF, PARA_ALIGN_CENTER)

src/plugins/drawreport/TimeLine.py

@@ -44,8 +44,7 @@ from gen.plug.docgen import (FontStyle, ParagraphStyle, GraphicsStyle,
                     FONT_SANS_SERIF, DASHED, PARA_ALIGN_CENTER)
 import Sort
 from QuestionDialog import ErrorDialog
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
-from Utils import probably_alive
 from gui.utils import ProgressMeter
 import config
 from gen.utils import get_birth_or_fallback, get_death_or_fallback

src/plugins/gramplet/AttributesGramplet.py

@@ -20,7 +20,7 @@
 #
 
 from gen.plug import Gramplet
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 from gettext import gettext as _
 
 class AttributesGramplet(Gramplet):

src/plugins/gramplet/DescendGramplet.py

@@ -38,7 +38,7 @@ from gettext import gettext as _
 #------------------------------------------------------------------------
 from gen.plug import Gramplet
 from ReportBase import ReportUtils
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 import DateHandler
 from gen.utils import get_birth_or_fallback, get_death_or_fallback
 

src/plugins/gramplet/FanChartGramplet.py

@@ -52,14 +52,14 @@ if gtk.pygtk_version < (2,3,93):
 # GRAMPS modules
 #
 #-------------------------------------------------------------------------
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 from gettext import gettext as _
 from gen.plug import Gramplet
 from Utils import (find_children, find_parents, find_witnessed_people)
 from libformatting import FormattingHelper
 import gen.lib
 import Errors
-from gui.editors import EditPerson, EditFamily 
+from gui.editors import EditPerson
 
 #-------------------------------------------------------------------------
 #

src/plugins/gramplet/PedigreeGramplet.py

@@ -35,7 +35,7 @@ import locale
 from gen.plug import Gramplet
 from TransUtils import sgettext as _
 from gettext import ngettext
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 import DateHandler
 import gen
 from gen.utils import get_birth_or_fallback, get_death_or_fallback

src/plugins/gramplet/RelativeGramplet.py

@@ -25,7 +25,7 @@
 #------------------------------------------------------------------------
 from gen.plug import Gramplet
 from TransUtils import sgettext as _
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 
 #------------------------------------------------------------------------
 #

src/plugins/gramplet/SessionLogGramplet.py

@@ -25,7 +25,7 @@
 #------------------------------------------------------------------------
 from gen.plug import Gramplet
 from TransUtils import sgettext as _
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 
 #------------------------------------------------------------------------
 #

src/plugins/gramplet/WhatsNext.py

@@ -28,7 +28,7 @@
 #------------------------------------------------------------------------
 from gen.lib import EventType, FamilyRelType, MarkerType
 from gen.plug import Gramplet
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 from ReportBase import ReportUtils
 from TransUtils import sgettext as _
 

src/plugins/graph/GVHourGlass.py

@@ -37,7 +37,7 @@ from gettext import gettext as _
 # GRAMPS modules
 #
 #------------------------------------------------------------------------
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 from Errors import ReportError
 from gen.plug.menu import (PersonOption, BooleanOption, NumberOption, 
                           EnumeratedListOption)

src/plugins/graph/GVRelGraph.py

@@ -48,7 +48,7 @@ from TransUtils import sgettext as _
 from gen.plug.menu import BooleanOption, EnumeratedListOption, FilterOption, \
                           PersonOption, ColorOption
 from ReportBase import Report, ReportUtils, MenuReportOptions
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 import DateHandler
 import gen.lib
 import Utils

src/plugins/import/ImportGrdb.py

@@ -48,7 +48,7 @@ __LOG = logging.getLogger(".Db")
 from gen.lib import (GenderStats, Source, Person, Family, Event, Place, 
                      MediaObject, Repository, Note, Attribute, AttributeType, 
                      NoteType)
-from gen.db.write import (DbBsddb, KEY_TO_CLASS_MAP, CLASS_TO_KEY_MAP)
+from gen.db.write import (KEY_TO_CLASS_MAP, CLASS_TO_KEY_MAP)
 from libgrdb import DbGrdb
 from gen.db.txn import DbTxn as Transaction
 from gen.db.cursor import GrampsCursor
@@ -58,7 +58,7 @@ import const
 from QuestionDialog import ErrorDialog
 from Errors import HandleError
 from gen.updatecallback import UpdateCallback
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 
 #-------------------------------------------------------------------------
 #

src/plugins/import/ImportXml.py

@@ -42,7 +42,7 @@ import Mime
 import gen.lib
 import Utils
 import DateHandler
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 from gen.db.dbconst import (PERSON_KEY, FAMILY_KEY, SOURCE_KEY, EVENT_KEY, 
                             MEDIA_KEY, PLACE_KEY, REPOSITORY_KEY, NOTE_KEY)
 from gen.updatecallback import UpdateCallback

src/plugins/lib/libformatting.py

@@ -39,7 +39,7 @@ from cgi import escape
 #-------------------------------------------------------------------------
 import gen.lib
 import DateHandler
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 from gen.utils import get_birth_or_fallback, get_death_or_fallback
 
 #-------------------------------------------------------------------------

src/plugins/lib/libnarrate.py

@@ -34,7 +34,7 @@ from gen.lib.person import Person
 from gen.lib.eventroletype import EventRoleType
 from gen.lib.eventtype import EventType
 from gen.lib.familyreltype import FamilyRelType
-from BasicUtils import name_displayer as _nd
+from gen.display.name import displayer as _nd
 import Utils
 from ReportBase import ReportUtils
 from libtranslate import Translator

src/plugins/textreport/AncestorReport.py

@@ -36,7 +36,7 @@ from gettext import gettext as _
 # gramps modules
 #
 #------------------------------------------------------------------------
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 from Errors import ReportError
 from gen.lib import ChildRefType
 from gen.plug.menu import BooleanOption, NumberOption, PersonOption, \

src/plugins/textreport/BirthdayReport.py

@@ -35,7 +35,7 @@ import datetime, time
 # GRAMPS modules
 #
 #------------------------------------------------------------------------
-from BasicUtils import name_displayer as _nd
+from gen.display.name import displayer as _nd
 from Errors import ReportError
 from gen.lib import NameType, EventType, Name, Date, Person
 import Relationship

src/plugins/textreport/DescendReport.py

@@ -41,7 +41,7 @@ from gettext import gettext as _
 from gen.plug.docgen import (IndexMark, FontStyle, ParagraphStyle,
                             FONT_SANS_SERIF, INDEX_TYPE_TOC, PARA_ALIGN_CENTER)
 from gen.plug.menu import NumberOption, PersonOption
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 from Errors import ReportError
 from ReportBase import Report, ReportUtils, MenuReportOptions
 import DateHandler

src/plugins/textreport/DetAncestralReport.py

@@ -38,7 +38,7 @@ from gettext import gettext as _
 # GRAMPS modules
 #
 #------------------------------------------------------------------------
-from BasicUtils import name_displayer as _nd
+from gen.display.name import displayer as _nd
 from Errors import ReportError
 from gen.lib import EventType, FamilyRelType, Person
 from gen.plug.docgen import (IndexMark, FontStyle, ParagraphStyle,

src/plugins/textreport/DetDescendantReport.py

@@ -39,7 +39,7 @@ from gettext import gettext as _
 # GRAMPS modules
 #
 #------------------------------------------------------------------------
-from BasicUtils import name_displayer as _nd
+from gen.display.name import displayer as _nd
 from Errors import ReportError
 from gen.lib import FamilyRelType, Person
 from gen.plug.menu import (BooleanOption, NumberOption, PersonOption, 

src/plugins/textreport/EndOfLineReport.py

@@ -34,7 +34,7 @@ from gettext import gettext as _
 # gramps modules
 #
 #------------------------------------------------------------------------
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 from Errors import ReportError
 from gen.plug.docgen import (IndexMark, FontStyle, ParagraphStyle, TableStyle,
                             TableCellStyle, FONT_SANS_SERIF, INDEX_TYPE_TOC,

src/plugins/textreport/FamilyGroup.py

@@ -36,7 +36,7 @@ from gen.plug.docgen import (IndexMark, FontStyle, ParagraphStyle, TableStyle,
                             INDEX_TYPE_TOC, PARA_ALIGN_CENTER)
 import DateHandler
 from TransUtils import sgettext as _
-from BasicUtils import name_displayer as _nd
+from gen.display.name import displayer as _nd
 
 #------------------------------------------------------------------------
 #

src/plugins/textreport/IndivComplete.py

@@ -46,7 +46,7 @@ from gen.plug.menu import BooleanOption, FilterOption, PersonOption, \
                           BooleanListOption
 from ReportBase import Report, ReportUtils, MenuReportOptions
 from ReportBase import Bibliography, Endnotes
-from BasicUtils import name_displayer as _nd
+from gen.display.name import displayer as _nd
 from Utils import media_path_full
 from QuestionDialog import WarningDialog
 

src/plugins/textreport/KinshipReport.py

@@ -36,7 +36,7 @@ from gettext import gettext as _
 # gramps modules
 #
 #------------------------------------------------------------------------
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 from Errors import ReportError
 import Relationship
 from gen.plug.docgen import (IndexMark, FontStyle, ParagraphStyle,

src/plugins/textreport/MarkerReport.py

@@ -42,7 +42,7 @@ from gen.plug.docgen import (IndexMark, FontStyle, ParagraphStyle,
                         INDEX_TYPE_TOC, PARA_ALIGN_CENTER)
 from gen.lib import MarkerType
 from Filters import GenericFilterFactory, Rules
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 import DateHandler
 
 #------------------------------------------------------------------------

src/plugins/textreport/NumberOfAncestorsReport.py

@@ -40,7 +40,7 @@ import math
 # GRAMPS modules
 #
 #------------------------------------------------------------------------
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 from Errors import ReportError
 from gen.plug.menu import PersonOption
 from gen.plug.docgen import (IndexMark, FontStyle, ParagraphStyle,

src/plugins/textreport/PlaceReport.py

@@ -41,7 +41,7 @@ from gen.plug.docgen import (IndexMark, FontStyle, ParagraphStyle, TableStyle,
                             INDEX_TYPE_TOC, PARA_ALIGN_CENTER)
 import DateHandler
 import Sort
-from BasicUtils import name_displayer as _nd
+from gen.display.name import displayer as _nd
 
 class PlaceReport(Report):
     """

src/plugins/tool/CalculateEstimatedDates.py

@@ -42,7 +42,7 @@ from gen.plug.menu import BooleanOption, NumberOption, StringOption, \
                          FilterOption, PersonOption, EnumeratedListOption
 import gen.lib
 import config
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 import Errors
 from ReportBase import ReportUtils
 from docgen import TextBufDoc

src/plugins/tool/Check.py

@@ -58,12 +58,11 @@ import gtk
 import gen.lib
 import Utils
 from gui.utils import ProgressMeter
-#import const
 import ManagedWindow
 
 from PluginUtils import Tool
 from QuestionDialog import OkDialog, MissingMediaDialog
-from BasicUtils import name_displayer as _nd
+from gen.display.name import displayer as _nd
 from glade import Glade
 
 #-------------------------------------------------------------------------

src/plugins/tool/Desbrowser.py

@@ -36,7 +36,7 @@ import gtk
 #
 #------------------------------------------------------------------------
 import const
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 from PluginUtils import Tool
 import GrampsDisplay
 import ManagedWindow

src/plugins/tool/EventNames.py

@@ -47,7 +47,7 @@ import gen.lib
 import Utils
 
 from PluginUtils import Tool
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 from QuestionDialog import OkDialog
 
 #-------------------------------------------------------------------------

src/plugins/tool/FindDupes.py

@@ -39,7 +39,7 @@ import const
 import gen.lib
 from gui.utils import ProgressMeter
 import soundex
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 from QuestionDialog import OkDialog
 import ListModel
 import Errors
@@ -47,7 +47,7 @@ from Merge import PersonCompare
 import GrampsDisplay
 import ManagedWindow
 from PluginUtils import Tool
-from QuestionDialog import ErrorDialog, RunDatabaseRepair
+from QuestionDialog import RunDatabaseRepair
 from TransUtils import sgettext as _
 from glade import Glade
 

src/plugins/tool/RelCalc.py

@@ -42,7 +42,7 @@ import gtk
 # GRAMPS modules
 #
 #-------------------------------------------------------------------------
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 import ManagedWindow
 from gui.views.treemodels import PeopleModel
 import Relationship

src/plugins/view/fanchartview.py

@@ -53,14 +53,14 @@ if gtk.pygtk_version < (2,3,93):
 # GRAMPS modules
 #
 #-------------------------------------------------------------------------
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 from Utils import (find_children, find_parents, find_witnessed_people)
 from libformatting import FormattingHelper
 import gen.lib
 from gui.views.navigationview import NavigationView
 import Errors
 import Bookmarks
-from gui.editors import EditPerson, EditFamily 
+from gui.editors import EditPerson
 
 #-------------------------------------------------------------------------
 #

src/plugins/view/geoview.py

@@ -64,7 +64,7 @@ import config
 import Errors
 from gui.utils import add_menuitem
 from ReportBase import CSS_FILES
-from BasicUtils import name_displayer as _nd
+from gen.display.name import displayer as _nd
 from PlaceUtils import conv_lat_lon
 from gui.views.pageview import PageView
 from gui.editors import EditPlace

src/plugins/view/pedigreeview.py

@@ -52,14 +52,12 @@ except:
 #-------------------------------------------------------------------------
 import gen.lib
 from gui.views.navigationview import NavigationView
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 from Utils import (media_path_full, probably_alive, find_children, 
                    find_parents, find_witnessed_people)
 from libformatting import FormattingHelper
-import DateHandler
 import ThumbNails
 import Errors
-from ReportBase import ReportUtils
 from gui.editors import EditPerson, EditFamily 
 from DdTargets import DdTargets
 import cPickle as pickle

src/plugins/view/pedigreeviewext.py

@@ -53,7 +53,7 @@ except:
 #-------------------------------------------------------------------------
 import gen.lib
 from gui.views.navigationview import NavigationView
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 from Utils import (media_path_full, probably_alive, find_children, 
                    find_parents, find_witnessed_people)
 from libformatting import FormattingHelper

src/plugins/view/personview.py

@@ -49,7 +49,7 @@ import gen.lib
 from gui.views.listview import ListView, LISTTREE
 from gui.views.treemodels import PeopleModel
 import Utils
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 from QuestionDialog import ErrorDialog, QuestionDialog
 import Errors
 import Bookmarks

src/plugins/view/relview.py

@@ -49,7 +49,7 @@ import pango
 import gen.lib
 from gui.views.navigationview import NavigationView
 from gui.editors import EditPerson, EditFamily
-from BasicUtils import name_displayer
+from gen.display.name import displayer as name_displayer
 from Utils import media_path_full, probably_alive
 import DateHandler
 import ThumbNails

src/plugins/webreport/NarrativeWeb.py

@@ -94,11 +94,9 @@ import ThumbNails
 import ImgManip
 import Mime
 from QuestionDialog import ErrorDialog, WarningDialog
-from BasicUtils import name_displayer as _nd
+from gen.display.name import displayer as _nd 
 from DateHandler import displayer as _dd
-from DateHandler import parser as _dp
 from gen.proxy import PrivateProxyDb, LivingProxyDb
-from gen.lib.eventroletype import EventRoleType
 from libhtmlconst import _CHARACTER_SETS, _CC, _COPY_OPTIONS
 
 # import HTML Class from

src/plugins/webreport/WebCal.py

@@ -65,7 +65,7 @@ from Utils import probably_alive, xml_lang, get_researcher
 from gui.utils import ProgressMeter
 from DateHandler import displayer as _dd
 
-from BasicUtils import name_displayer as _nd
+from gen.display.name import displayer as _nd
 
 import libholiday
 from libhtml import Html