2008-02-18 Raphael Ackermann <raphael.ackermann@gmail.com>

* src/* 143 files
    * test/try_tree_model.py
    * windows/nsis/gcheck.py
    imports cleanup

svn: r10055

src/plugins/BookReport.py

@@ -55,8 +55,9 @@ except:
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
+import gtk
+from gtk import glade
 from gtk import RESPONSE_OK
-import gtk.glade
 
 #-------------------------------------------------------------------------
 #
@@ -589,7 +590,7 @@ class BookListDisplay:
         self.dosave = dosave
         base = os.path.dirname(__file__)
         glade_file = os.path.join(base,"book.glade")
-        self.xml = gtk.glade.XML(glade_file, "booklist", "gramps")
+        self.xml = glade.XML(glade_file, "booklist", "gramps")
         self.top = self.xml.get_widget('booklist')
 
         ManagedWindow.set_titles(self.top,
@@ -703,7 +704,7 @@ class BookReportSelector(ManagedWindow.ManagedWindow):
         base = os.path.dirname(__file__)
         glade_file = os.path.join(base,"book.glade")
 
-        self.xml = gtk.glade.XML(glade_file, "top", "gramps")
+        self.xml = glade.XML(glade_file, "top", "gramps")
         window = self.xml.get_widget("top")
         title_label = self.xml.get_widget('title')
         self.set_window(window, title_label, self.title)

src/plugins/Calendar.py

@@ -37,17 +37,16 @@ import os
 #------------------------------------------------------------------------
 import BaseDoc
 from BasicUtils import name_displayer
-from DateHandler import displayer
 from PluginUtils import register_report, relationship_class
-from ReportBase import Report, ReportUtils, MenuReportOptions, \
-    CATEGORY_DRAW, CATEGORY_TEXT, \
-    MODE_GUI, MODE_BKI, MODE_CLI
-from PluginUtils import NumberOption, BooleanOption, StringOption, \
-    FilterOption, EnumeratedListOption, PersonOption
+from ReportBase import (Report, ReportUtils, MenuReportOptions, 
+                        CATEGORY_DRAW, CATEGORY_TEXT, 
+                        MODE_GUI, MODE_BKI, MODE_CLI)
+from PluginUtils import (NumberOption, BooleanOption, StringOption, 
+                         FilterOption, EnumeratedListOption, PersonOption)
 import GrampsLocale
 import gen.lib
 from Utils import probably_alive, ProgressMeter
-from FontScale import string_trim, string_width
+from FontScale import string_trim
 pt2cm = ReportUtils.pt2cm
 cm2pt = ReportUtils.cm2pt
 

src/plugins/ChangeNames.py

@@ -37,7 +37,7 @@ from gettext import gettext as _
 #-------------------------------------------------------------------------
 import gobject
 import gtk
-import gtk.glade
+from gtk import glade
 
 #-------------------------------------------------------------------------
 #
@@ -178,7 +178,7 @@ class ChangeNames(Tool.BatchTool, ManagedWindow.ManagedWindow):
         base = os.path.dirname(__file__)
         glade_file = os.path.join(base,"changenames.glade")
         
-        self.top = gtk.glade.XML(glade_file,"top","gramps")
+        self.top = glade.XML(glade_file,"top","gramps")
         window = self.top.get_widget('top')
         self.top.signal_autoconnect({
             "destroy_passed_object" : self.close,

src/plugins/ChangeTypes.py

@@ -35,15 +35,13 @@ from gettext import gettext as _
 # GNOME/GTK modules
 #
 #------------------------------------------------------------------------
-import gtk
-import gtk.glade
+from gtk import glade
 
 #------------------------------------------------------------------------
 #
 # GRAMPS modules
 #
 #------------------------------------------------------------------------
-import const
 import Utils
 import locale
 import ManagedWindow
@@ -78,7 +76,7 @@ class ChangeTypes(Tool.BatchTool, ManagedWindow.ManagedWindow):
         
         base = os.path.dirname(__file__)
         glade_file = "%s/%s" % (base,"changetype.glade")
-        self.glade = gtk.glade.XML(glade_file,"top","gramps")
+        self.glade = glade.XML(glade_file,"top","gramps")
             
         self.auto1 = self.glade.get_widget("original")
         self.auto2 = self.glade.get_widget("new")

src/plugins/Check.py

@@ -47,7 +47,7 @@ log = logging.getLogger(".CheckRepair")
 #
 #-------------------------------------------------------------------------
 import gtk
-import gtk.glade
+from gtk import glade
 
 #-------------------------------------------------------------------------
 #
@@ -56,7 +56,7 @@ import gtk.glade
 #-------------------------------------------------------------------------
 import gen.lib
 import Utils
-import const
+#import const
 import ManagedWindow
 
 from PluginUtils import Tool, register_tool
@@ -109,8 +109,9 @@ def _table_low_level(db,table):
         print "    No dupes found for this table"
         return True
 
-    import gen.db
-    table_cursor = gen.db.GrampsDBDirDupCursor(table)
+#    import gen.db
+    from gen.db import GrampsDBDirDupCursor
+    table_cursor = GrampsDBDirDupCursor(table)
     for handle in dup_handles:
         print "    Duplicates found for handle: %s" % handle
         try:
@@ -1472,7 +1473,7 @@ class Report(ManagedWindow.ManagedWindow):
         
         base = os.path.dirname(__file__)
         glade_file = base + os.sep + "summary.glade"
-        topDialog = gtk.glade.XML(glade_file,"summary","gramps")
+        topDialog = glade.XML(glade_file,"summary","gramps")
         topDialog.get_widget("close").connect('clicked',self.close)
 
         window = topDialog.get_widget("summary")

src/plugins/CmdRef.py

@@ -38,7 +38,7 @@ from gettext import gettext as _
 #
 #-------------------------------------------------------------------------
 from PluginUtils import Tool, cl_list, cli_tool_list, register_tool
-from ReportBase import CATEGORY_BOOK, CATEGORY_CODE, CATEGORY_WEB
+from ReportBase import CATEGORY_BOOK, CATEGORY_WEB
 from ReportBase._CommandLineReport import CommandLineReport
 
 #-------------------------------------------------------------------------

src/plugins/CountAncestors.py

@@ -38,7 +38,7 @@ from math import pow
 # GNOME/GTK modules
 #
 #------------------------------------------------------------------------
-import gtk.glade
+from gtk import glade
 
 #------------------------------------------------------------------------
 #
@@ -65,7 +65,7 @@ class CountAncestors(ManagedWindow.ManagedWindow):
         database = dbstate.db        
         text = ""
         glade_file = "%s/summary.glade" % os.path.dirname(__file__)
-        topDialog = gtk.glade.XML(glade_file,"summary","gramps")
+        topDialog = glade.XML(glade_file,"summary","gramps")
         topDialog.signal_autoconnect({
             "destroy_passed_object" : self.close,
             })

src/plugins/CustomBookText.py

@@ -34,7 +34,6 @@ from gettext import gettext as _
 # gtk
 #
 #------------------------------------------------------------------------
-import gtk
 
 #------------------------------------------------------------------------
 #

src/plugins/DateParserDisplayTest.py

@@ -39,11 +39,10 @@ import sys
 # GRAMPS modules
 #
 #-------------------------------------------------------------------------
-import Errors
 import gen.lib
 from PluginUtils import Tool, register_tool
 import Utils
-from QuestionDialog import QuestionDialog,ErrorDialog
+from QuestionDialog import QuestionDialog
 from DateHandler import parser as _dp
 from DateHandler import displayer as _dd
 

src/plugins/DefaultGramplets.py

@@ -17,9 +17,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 import sys
-import os
 import re
-import time
 import urllib
 
 import gen.lib

src/plugins/Desbrowser.py

@@ -36,7 +36,7 @@ from gettext import gettext as _
 #
 #------------------------------------------------------------------------
 import gtk
-import gtk.glade
+from gtk import glade
 
 #------------------------------------------------------------------------
 #
@@ -72,7 +72,7 @@ class DesBrowse(Tool.ActivePersonTool, ManagedWindow.ManagedWindow):
         base = os.path.dirname(__file__)
         glade_file = base + os.sep + "desbrowse.glade"
 
-        self.glade = gtk.glade.XML(glade_file,"top","gramps")
+        self.glade = glade.XML(glade_file,"top","gramps")
         self.glade.signal_autoconnect({
             "destroy_passed_object" : self.close,
             "on_help_clicked"       : self.on_help_clicked,

src/plugins/Eval.py

@@ -38,8 +38,7 @@ from gettext import gettext as _
 # GNOME/GTK modules
 #
 #------------------------------------------------------------------------
-import gtk
-import gtk.glade
+from gtk import glade
 
 #------------------------------------------------------------------------
 #
@@ -62,7 +61,7 @@ class Eval(Tool.Tool,ManagedWindow.ManagedWindow):
         ManagedWindow.ManagedWindow.__init__(self,uistate,[],self.__class__)
 
         glade_file = "%s/%s" % (os.path.dirname(__file__),"eval.glade")
-        self.glade = gtk.glade.XML(glade_file,"top","gramps")
+        self.glade = glade.XML(glade_file,"top","gramps")
 
         window = self.glade.get_widget("top")
         self.dbuf = self.glade.get_widget("display").get_buffer()

src/plugins/EventCmp.py

@@ -36,7 +36,8 @@ from gettext import gettext as _
 # GNOME/GTK modules
 #
 #------------------------------------------------------------------------
-import gtk.glade
+import gtk
+from gtk import glade
 
 #------------------------------------------------------------------------
 #
@@ -46,7 +47,7 @@ import gtk.glade
 from Filters import GenericFilter, build_filter_menu, Rules
 import Sort
 import Utils
-from ODSTab import ODSTab
+from docgen import ODSTab
 import const
 import Errors
 import DateHandler
@@ -114,7 +115,7 @@ class EventComparison(Tool.Tool,ManagedWindow.ManagedWindow):
         self.glade_file = base + os.sep + "eventcmp.glade"
         self.qual = 0
 
-        self.filterDialog = gtk.glade.XML(self.glade_file,"filters","gramps")
+        self.filterDialog = glade.XML(self.glade_file,"filters","gramps")
         self.filterDialog.signal_autoconnect({
             "on_apply_clicked"       : self.on_apply_clicked,
             "on_editor_clicked"      : self.filter_editor_clicked,
@@ -217,7 +218,7 @@ class DisplayChart(ManagedWindow.ManagedWindow):
         base = os.path.dirname(__file__)
         self.glade_file = base + os.sep + "eventcmp.glade"
 
-        self.topDialog = gtk.glade.XML(self.glade_file,"view","gramps")
+        self.topDialog = glade.XML(self.glade_file,"view","gramps")
         self.topDialog.signal_autoconnect({
             "on_write_table"        : self.on_write_table,
             "destroy_passed_object" : self.close,

src/plugins/ExportCSV.py

@@ -38,8 +38,7 @@ import codecs
 # GNOME/GTK modules
 #
 #-------------------------------------------------------------------------
-import gtk
-import gtk.glade
+from gtk import glade
 
 #------------------------------------------------------------------------
 #
@@ -56,7 +55,6 @@ log = logging.getLogger(".ExportCSV")
 #-------------------------------------------------------------------------
 import gen.lib
 from Filters import GenericFilter, Rules, build_filter_menu
-import const
 import Utils
 import Errors
 from QuestionDialog import ErrorDialog
@@ -177,7 +175,7 @@ class CSVWriterOptionBox:
         if not os.path.isfile(glade_file):
             glade_file = "plugins/csvexport.glade"
 
-        self.topDialog = gtk.glade.XML(glade_file,"csvExport","gramps")
+        self.topDialog = glade.XML(glade_file,"csvExport","gramps")
         filter_obj = self.topDialog.get_widget("filter")
 
         all = GenericFilter()

src/plugins/ExportVCalendar.py

@@ -37,8 +37,8 @@ from gettext import gettext as _
 # GNOME/GTK modules
 #
 #-------------------------------------------------------------------------
-from gtk import glade
 import gtk
+from gtk import glade
 
 #------------------------------------------------------------------------
 #
@@ -54,7 +54,6 @@ log = logging.getLogger(".ExportVCal")
 #
 #-------------------------------------------------------------------------
 from Filters import GenericFilter, Rules, build_filter_menu
-#import const
 import Utils
 from gen.lib import Date, EventType
 import Errors

src/plugins/ExportVCard.py

@@ -44,7 +44,7 @@ log = logging.getLogger(".ExportVCard")
 # GNOME/GTK modules
 #
 #-------------------------------------------------------------------------
-import gtk.glade
+from gtk import glade
 
 #-------------------------------------------------------------------------
 #
@@ -77,7 +77,7 @@ class CardWriterOptionBox:
         if not os.path.isfile(glade_file):
             glade_file = "plugins/vcardexport.glade"
 
-        self.topDialog = gtk.glade.XML(glade_file,"vcardExport","gramps")
+        self.topDialog = glade.XML(glade_file,"vcardExport","gramps")
 
         filter_obj = self.topDialog.get_widget("filter")
         self.copy = 0

src/plugins/ExtractCity.py

@@ -38,7 +38,7 @@ from gettext import gettext as _
 #
 #-------------------------------------------------------------------------
 import gtk
-import gtk.glade
+from gtk import glade
 import gobject
 
 #-------------------------------------------------------------------------
@@ -458,7 +458,7 @@ class ExtractCity(Tool.BatchTool, ManagedWindow.ManagedWindow):
         base = os.path.dirname(__file__)
         glade_file = os.path.join(base, "changenames.glade")
         
-        self.top = gtk.glade.XML(glade_file, "top", "gramps")
+        self.top = glade.XML(glade_file, "top", "gramps")
         window = self.top.get_widget('top')
         self.top.signal_autoconnect({
             "destroy_passed_object" : self.close, 

src/plugins/FamilyLines.py

@@ -65,15 +65,15 @@ import DateHandler
 import GrampsWidgets
 import ManagedWindow
 from PluginUtils import register_report
-from ReportBase import Report, ReportUtils, ReportOptions, CATEGORY_CODE, MODE_GUI, MODE_CLI
+from ReportBase import (Report, ReportUtils, ReportOptions, CATEGORY_CODE, 
+                        MODE_GUI)
 from ReportBase._ReportDialog import ReportDialog
-from QuestionDialog import ErrorDialog, WarningDialog
+from QuestionDialog import ErrorDialog
 
 #from NameDisplay import displayer as _nd       # Gramps version <  3.0
 from BasicUtils import name_displayer as _nd    # Gramps version >= 3.0
 
 from DateHandler import displayer as _dd
-from DateHandler import parser
 from Selectors import selector_factory
 
 #------------------------------------------------------------------------

src/plugins/FindDupes.py

@@ -35,7 +35,7 @@ from gettext import gettext as _
 # GNOME libraries
 #
 #-------------------------------------------------------------------------
-import gtk.glade
+from gtk import glade
 
 #-------------------------------------------------------------------------
 #
@@ -104,7 +104,7 @@ class Merge(Tool.Tool,ManagedWindow.ManagedWindow):
 
         base = os.path.dirname(__file__)
         self.glade_file = "%s/%s" % (base,"merge.glade")
-        top = gtk.glade.XML(self.glade_file,"dialog","gramps")
+        top = glade.XML(self.glade_file,"dialog","gramps")
 
         # retrieve options
         threshold = self.options.handler.options_dict['threshold']
@@ -556,7 +556,7 @@ class ShowMatches(ManagedWindow.ManagedWindow):
         
         base = os.path.dirname(__file__)
         self.glade_file = "%s/%s" % (base,"merge.glade")
-        top = gtk.glade.XML(self.glade_file,"mergelist","gramps")
+        top = glade.XML(self.glade_file,"mergelist","gramps")
         window = top.get_widget("mergelist")
         self.set_window(window, top.get_widget('title'),
                         _('Potential Merges'))

src/plugins/ImportCSV.py

@@ -55,15 +55,12 @@ import gtk
 # GRAMPS modules
 #
 #-------------------------------------------------------------------------
-import Errors
 import gen.lib
-import const
 from QuestionDialog import ErrorDialog
 from DateHandler import parser as _dp
 from PluginUtils import register_import
 from Utils import gender as gender_map
 from Utils import ProgressMeter
-from htmlentitydefs import name2codepoint
 
 #-------------------------------------------------------------------------
 #

src/plugins/ImportGeneWeb.py

@@ -45,7 +45,6 @@ log = logging.getLogger(".ImportGeneWeb")
 #
 #-------------------------------------------------------------------------
 import gtk
-import gtk.glade
 
 #-------------------------------------------------------------------------
 #
@@ -56,7 +55,6 @@ import Errors
 import gen.lib
 import const
 from QuestionDialog import ErrorDialog
-from DateHandler import parser as _dp
 from PluginUtils import register_import
 from htmlentitydefs import name2codepoint
 

src/plugins/ImportvCard.py

@@ -45,7 +45,6 @@ log = logging.getLogger(".ImportVCard")
 #
 #-------------------------------------------------------------------------
 import gtk
-import gtk.glade
 
 #-------------------------------------------------------------------------
 #

src/plugins/Leak.py

@@ -38,8 +38,7 @@ from bsddb.db import DBError
 # GNOME/GTK modules
 #
 #------------------------------------------------------------------------
-import gtk
-import gtk.glade
+from gtk import glade
 import gc
 
 #------------------------------------------------------------------------
@@ -47,7 +46,6 @@ import gc
 # GRAMPS modules
 #
 #------------------------------------------------------------------------
-import Utils
 from PluginUtils import Tool, register_tool
 import ManagedWindow
 
@@ -64,7 +62,7 @@ class Leak(Tool.Tool,ManagedWindow.ManagedWindow):
         ManagedWindow.ManagedWindow.__init__(self,uistate,[],self.__class__)
 
         glade_file = os.path.dirname(__file__) + os.sep + "leak.glade"
-        self.glade = gtk.glade.XML(glade_file,"top","gramps")
+        self.glade = glade.XML(glade_file,"top","gramps")
 
         window = self.glade.get_widget("top")
         self.eval = self.glade.get_widget("eval")

src/plugins/NarrativeWeb.py

@@ -61,13 +61,12 @@ import gen.lib
 import const
 from GrampsCfg import get_researcher
 import Sort
-from PluginUtils import register_report
-from PluginUtils import FilterOption, EnumeratedListOption, PersonOption, \
-    BooleanOption, NumberOption, StringOption, DestinationOption, NoteOption, \
-    MediaOption
-from ReportBase import Report, ReportUtils, MenuReportOptions, \
-     CATEGORY_WEB, MODE_GUI, MODE_CLI
-from ReportBase import Bibliography
+from PluginUtils import (register_report, FilterOption, EnumeratedListOption, 
+                         PersonOption, BooleanOption, NumberOption, 
+                         StringOption, DestinationOption, NoteOption, 
+                         MediaOption)
+from ReportBase import (Report, ReportUtils, MenuReportOptions, CATEGORY_WEB, 
+                        MODE_GUI, MODE_CLI, Bibliography)
 import Utils
 import ThumbNails
 import ImgManip
@@ -76,8 +75,7 @@ from QuestionDialog import ErrorDialog, WarningDialog
 from BasicUtils import name_displayer as _nd
 from DateHandler import displayer as _dd
 from DateHandler import parser as _dp
-from gen.proxy import PrivateProxyDb
-from gen.proxy import LivingProxyDb
+from gen.proxy import PrivateProxyDb, LivingProxyDb
 from gen.lib.eventroletype import EventRoleType
 
 #------------------------------------------------------------------------

src/plugins/OwnerEditor.py

@@ -36,7 +36,7 @@ from gettext import gettext as _
 #
 #-------------------------------------------------------------------------
 import gtk
-import gtk.glade
+from gtk import glade
 
 #-------------------------------------------------------------------------
 #
@@ -89,7 +89,7 @@ class OwnerEditor(Tool.Tool, ManagedWindow.ManagedWindow):
         glade_file = os.path.join(base, "ownereditor.glade")
 
         # get the main window from glade
-        top_xml = gtk.glade.XML(glade_file, "top", "gramps")
+        top_xml = glade.XML(glade_file, "top", "gramps")
 
         # set gramps style title for the window
         window = top_xml.get_widget("top")
@@ -111,7 +111,7 @@ class OwnerEditor(Tool.Tool, ManagedWindow.ManagedWindow):
         })
 
         # fetch the popup menu
-        popup_xml = gtk.glade.XML(glade_file, "popup-menu", "gramps")
+        popup_xml = glade.XML(glade_file, "popup-menu", "gramps")
         self.menu = popup_xml.get_widget("popup-menu")
         popup_xml.signal_connect("on_menu_activate", self.on_menu_activate)
 

src/plugins/PHPGedViewConnector.py

@@ -26,13 +26,10 @@
 import httplib
 import urllib2
 import gtk
-import gtk.glade
+from gtk import glade
 import os
-from random import randint
-from tempfile import NamedTemporaryFile
 from tempfile import mkstemp
 from gettext import gettext as _
-from PluginUtils import register_tool
 #
 # Interface to phpGedView
 #
@@ -284,7 +281,7 @@ class phpGedViewImporter:
         self.connector = None
         
         glade_file = "%s/phpgedview.glade" % os.path.dirname(__file__)
-        top = gtk.glade.XML(glade_file,'importer','gramps')
+        top = glade.XML(glade_file,'importer','gramps')
         self.url_entry = top.get_widget('url_entry')
         self.version_label = top.get_widget('version_label')
         self.version_label.set_text("")
@@ -319,7 +316,7 @@ class phpGedViewImporter:
             gtk.main_iteration()
         
     def on_next_pressed_cb(self, widget, event=None, data=None):
-        import GedcomParser
+        from GrampsDbUtils import GedcomParser
         if event:
             print event.type
         

src/plugins/PatchNames.py

@@ -37,7 +37,7 @@ from gettext import gettext as _
 #
 #-------------------------------------------------------------------------
 import gtk
-import gtk.glade
+from gtk import glade
 import gobject
 
 #-------------------------------------------------------------------------
@@ -180,7 +180,7 @@ class PatchNames(Tool.BatchTool, ManagedWindow.ManagedWindow):
         base = os.path.dirname(__file__)
         glade_file = os.path.join(base,"patchnames.glade")
         
-        self.top = gtk.glade.XML(glade_file,"top","gramps")
+        self.top = glade.XML(glade_file,"top","gramps")
         window = self.top.get_widget('top')
         self.top.signal_autoconnect({
             "destroy_passed_object" : self.close,

src/plugins/Rebuild.py

@@ -27,8 +27,6 @@
 # python modules
 #
 #-------------------------------------------------------------------------
-import os
-import cStringIO
 from gettext import gettext as _
 
 #------------------------------------------------------------------------
@@ -44,16 +42,12 @@ log = logging.getLogger(".Rebuild")
 # gtk modules
 #
 #-------------------------------------------------------------------------
-import gtk
-import gtk.glade
 
 #-------------------------------------------------------------------------
 #
 # GRAMPS modules
 #
 #-------------------------------------------------------------------------
-import gen.lib
-import const
 from PluginUtils import Tool, register_tool
 from QuestionDialog import OkDialog
 from BasicUtils import UpdateCallback

src/plugins/RebuildRefMap.py

@@ -29,8 +29,6 @@
 # python modules
 #
 #-------------------------------------------------------------------------
-import os
-import cStringIO
 from gettext import gettext as _
 
 #------------------------------------------------------------------------
@@ -46,16 +44,12 @@ log = logging.getLogger(".RebuildRefMap")
 # gtk modules
 #
 #-------------------------------------------------------------------------
-import gtk
-import gtk.glade
 
 #-------------------------------------------------------------------------
 #
 # GRAMPS modules
 #
 #-------------------------------------------------------------------------
-import gen.lib
-import const
 from PluginUtils import Tool, register_tool
 from QuestionDialog import OkDialog
 from BasicUtils import UpdateCallback

src/plugins/References.py

@@ -22,11 +22,13 @@
 """
 Display references for any object
 """
+from ReportBase import (CATEGORY_QR_SOURCE, CATEGORY_QR_PERSON, 
+                        CATEGORY_QR_FAMILY, CATEGORY_QR_EVENT, 
+                        CATEGORY_QR_PLACE, CATEGORY_QR_REPOSITORY)
 
 from Simple import SimpleAccess, SimpleDoc, SimpleTable
 from gettext import gettext as _
 from PluginUtils import register_quick_report
-from ReportBase import *
 
 def get_ref(db, objclass, handle):
     """

src/plugins/RelCalc.py

@@ -35,19 +35,16 @@ from gettext import gettext as _
 # GNOME libraries
 #
 #-------------------------------------------------------------------------
-import gtk.glade
-from gtk import TextBuffer
+from gtk import glade
+import gtk
 
 #-------------------------------------------------------------------------
 #
 # GRAMPS modules
 #
 #-------------------------------------------------------------------------
-import gen.lib
 from BasicUtils import name_displayer
 import ManagedWindow
-import ListModel
-import DateHandler
 from DisplayModels import PeopleModel
 
 from QuestionDialog import ErrorDialog
@@ -87,7 +84,7 @@ class RelCalc(Tool.Tool, ManagedWindow.ManagedWindow):
 
         base = os.path.dirname(__file__)
         glade_file = base + os.sep + "relcalc.glade"
-        self.glade = gtk.glade.XML(glade_file, "relcalc", "gramps")
+        self.glade = glade.XML(glade_file, "relcalc", "gramps")
 
         name = ''
         if self.person:
@@ -103,7 +100,7 @@ class RelCalc(Tool.Tool, ManagedWindow.ManagedWindow):
     
         self.tree = self.glade.get_widget("peopleList")
         self.text = self.glade.get_widget("text1")
-        self.textbuffer = TextBuffer()
+        self.textbuffer = gtk.TextBuffer()
         self.text.set_buffer(self.textbuffer)
         
         self.model = PeopleModel(self.db,None)

src/plugins/RemoveUnused.py

@@ -44,7 +44,7 @@ log = logging.getLogger(".RemoveUnused")
 #
 #-------------------------------------------------------------------------
 import gtk
-import gtk.glade
+from gtk import glade
 import gobject
 
 #-------------------------------------------------------------------------
@@ -117,7 +117,7 @@ class RemoveUnused(Tool.Tool,ManagedWindow.ManagedWindow,UpdateCallback):
         base = os.path.dirname(__file__)
         self.glade_file = base + os.sep + "unused.glade"
 
-        self.top = gtk.glade.XML(self.glade_file,"unused","gramps")
+        self.top = glade.XML(self.glade_file,"unused","gramps")
         window = self.top.get_widget("unused")
         self.set_window(window,self.top.get_widget('title'),self.title)
 

src/plugins/SameSurnames.py

@@ -28,7 +28,7 @@ from gettext import gettext as _
 from PluginUtils import register_quick_report
 from ReportBase import CATEGORY_QR_PERSON
 from Filters.Rules import Rule
-from Filters import GenericFilterFactory, Rules
+from Filters import GenericFilterFactory
 
 class IncompleteSurname(Rule):
     """People with incomplete surnames"""

src/plugins/SimpleBookTitle.py

@@ -24,7 +24,6 @@
 # python modules
 #
 #------------------------------------------------------------------------
-import os
 import time
 from TransUtils import sgettext as _
 

src/plugins/SoundGen.py

@@ -35,7 +35,6 @@ from gettext import gettext as _
 # GNOME/GTK modules
 #
 #------------------------------------------------------------------------
-import gtk
 from gtk import glade
 #------------------------------------------------------------------------
 #

src/plugins/Summary.py

@@ -36,7 +36,7 @@ from gettext import gettext as _
 # GNOME/GTK modules
 #
 #------------------------------------------------------------------------
-import gtk.glade
+from gtk import glade
 
 #------------------------------------------------------------------------
 #
@@ -157,7 +157,7 @@ class SummaryReport(ManagedWindow.ManagedWindow):
         base = os.path.dirname(__file__)
         glade_file = "%s/summary.glade" % base
 
-        topDialog = gtk.glade.XML(glade_file,"summary","gramps")
+        topDialog = glade.XML(glade_file,"summary","gramps")
         topDialog.signal_autoconnect({
             "destroy_passed_object" : self.close,
         })

src/plugins/TestcaseGenerator.py

@@ -28,8 +28,6 @@
 # standard python modules
 #
 #-------------------------------------------------------------------------
-import traceback
-import sys
 from random import randint,choice,random
 from gettext import gettext as _
 
@@ -39,20 +37,16 @@ from gettext import gettext as _
 #
 #-------------------------------------------------------------------------
 import gtk 
-import gtk.glade
 
 #-------------------------------------------------------------------------
 #
 # GRAMPS modules
 #
 #-------------------------------------------------------------------------
-import Errors
 import gen.lib
 from PluginUtils import Tool, register_tool
-import const
 import Utils
 import LdsUtils
-from QuestionDialog import ErrorDialog
 
 #-------------------------------------------------------------------------
 #

src/plugins/Verify.py

@@ -42,7 +42,7 @@ import Errors
 #
 #------------------------------------------------------------------------
 import gtk
-import gtk.glade 
+from gtk import glade
 import gobject
 
 #------------------------------------------------------------------------
@@ -236,7 +236,7 @@ class Verify(Tool.Tool, ManagedWindow, UpdateCallback):
         self.glade_file = base + os.sep + "verify.glade"
         self.vr = None 
 
-        self.top = gtk.glade.XML(self.glade_file,"verify_settings","gramps")
+        self.top = glade.XML(self.glade_file,"verify_settings","gramps")
         self.top.signal_autoconnect({
             "destroy_passed_object" : self.close,
             "on_help_clicked"       : self.on_help_clicked,
@@ -462,7 +462,7 @@ class VerifyResults(ManagedWindow):
         base = os.path.dirname(__file__)
         self.glade_file = base + os.sep + "verify.glade"
 
-        self.top = gtk.glade.XML(self.glade_file,"verify_result","gramps")
+        self.top = glade.XML(self.glade_file,"verify_result","gramps")
         window = self.top.get_widget("verify_result")
         self.set_window(window,self.top.get_widget('title'),self.title)
     

src/plugins/WriteCD.py

@@ -45,7 +45,6 @@ log = logging.getLogger(".WriteCD")
 #
 #-------------------------------------------------------------------------
 import gtk
-import gtk.glade
 import Errors
 
 #This is a GNOME only plugin
@@ -62,11 +61,11 @@ except ImportError:
           "for GNOME are not installed"))
 
 try:
-    from gnomevfs import URI, create, OPEN_WRITE, make_directory, \
-                            FileExistsError
+    from gnomevfs import (URI, create, OPEN_WRITE, make_directory, 
+                          FileExistsError)
 except:
-    from gnome.vfs import URI, create, OPEN_WRITE, make_directory, \
-                            FileExistsError
+    from gnome.vfs import (URI, create, OPEN_WRITE, make_directory, 
+                           FileExistsError)
 
 #-------------------------------------------------------------------------
 #

src/plugins/WriteFtree.py

@@ -44,8 +44,7 @@ log = logging.getLogger(".WriteFtree")
 # GNOME/GTK modules
 #
 #-------------------------------------------------------------------------
-import gtk
-import gtk.glade
+from gtk import glade
 
 #-------------------------------------------------------------------------
 #
@@ -80,7 +79,7 @@ class FtreeWriterOptionBox:
         base = os.path.dirname(__file__)
         glade_file = "%s/%s" % (base,"writeftree.glade")
         
-        self.top = gtk.glade.XML(glade_file, "top", "gramps")
+        self.top = glade.XML(glade_file, "top", "gramps")
 
         filter_obj = self.top.get_widget("filter")
 

src/plugins/WriteGeneWeb.py

@@ -35,8 +35,7 @@ from gettext import gettext as _
 # GNOME/GTK modules
 #
 #-------------------------------------------------------------------------
-import gtk
-import gtk.glade
+from gtk import glade
 
 #------------------------------------------------------------------------
 #
@@ -81,7 +80,7 @@ class GeneWebWriterOptionBox:
         if not os.path.isfile(glade_file):
             glade_file = "plugins/genewebexport.glade"
 
-        self.topDialog = gtk.glade.XML(glade_file, "genewebExport", "gramps")
+        self.topDialog = glade.XML(glade_file, "genewebExport", "gramps")
         self.topDialog.signal_autoconnect({
                 "on_restrict_toggled": self.on_restrict_toggled
                 })

src/plugins/WritePkg.py

@@ -51,7 +51,6 @@ log = logging.getLogger(".WritePkg")
 #
 #-------------------------------------------------------------------------
 import gtk
-import gtk.glade
 
 #-------------------------------------------------------------------------
 #
@@ -59,8 +58,6 @@ import gtk.glade
 #
 #-------------------------------------------------------------------------
 from GrampsDbUtils import XmlWriter
-import Utils
-#from QuestionDialog import MissingMediaDialog
 from PluginUtils import register_export
 
 #-------------------------------------------------------------------------

src/plugins/rel_da.py

@@ -33,7 +33,6 @@
 import gen.lib
 import Relationship
 import types
-from gettext import gettext as _
 from PluginUtils import register_relcalc
 
 #-------------------------------------------------------------------------

src/plugins/rel_de.py

@@ -35,7 +35,6 @@
 import gen.lib
 import Relationship
 import types
-from gettext import gettext as _
 from PluginUtils import register_relcalc
 
 #-------------------------------------------------------------------------

src/plugins/rel_es.py

@@ -32,7 +32,6 @@
 import gen.lib
 import Relationship
 import types
-from gettext import gettext as _
 from PluginUtils import register_relcalc
 
 #-------------------------------------------------------------------------

src/plugins/rel_fi.py

@@ -33,7 +33,6 @@
 import gen.lib
 import Relationship
 import types
-from gettext import gettext as _
 from PluginUtils import register_relcalc
 
 #-------------------------------------------------------------------------

src/plugins/rel_fr.py

@@ -29,8 +29,6 @@
 
 import gen.lib
 import Relationship
-import types
-from gettext import gettext as _
 from PluginUtils import register_relcalc
 
 #-------------------------------------------------------------------------

src/plugins/rel_hu.py

@@ -34,7 +34,6 @@ import gen.lib
 import Relationship
 from PluginUtils import register_relcalc
 import types
-from gettext import gettext as _
 
 #-------------------------------------------------------------------------
 #

src/plugins/rel_nl.py

@@ -29,8 +29,6 @@
 
 import gen.lib
 import Relationship
-import types
-from gettext import gettext as _
 from PluginUtils import register_relcalc
 
 #-------------------------------------------------------------------------

src/plugins/rel_no.py

@@ -33,7 +33,6 @@
 import gen.lib
 import Relationship
 import types
-from gettext import gettext as _
 from PluginUtils import register_relcalc
 
 #-------------------------------------------------------------------------

src/plugins/rel_sv.py

@@ -33,8 +33,6 @@
 
 import gen.lib
 import Relationship
-import types
-from gettext import gettext as _
 from PluginUtils import register_relcalc
 
 #-------------------------------------------------------------------------