diff --git a/ChangeLog b/ChangeLog index d192fe915..f9b2b3067 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,5 @@ 2006-07-02 Don Allingham + * various: pyflakes fixes * src/DataViews/_PedigreeView.py: add filter editor support * src/DataViews/_Relationship.py: add filter editor support * src/DataViews/_PersonView.py: move filter editor support to PageView diff --git a/src/DataViews/_EventView.py b/src/DataViews/_EventView.py index eaf8a4ef3..507f1baa5 100644 --- a/src/DataViews/_EventView.py +++ b/src/DataViews/_EventView.py @@ -25,7 +25,6 @@ # #------------------------------------------------------------------------- import gtk -import gtk.gdk #------------------------------------------------------------------------- # @@ -35,13 +34,12 @@ import gtk.gdk import RelLib import PageView import DisplayModels -import const import Utils import Errors import Bookmarks from DdTargets import DdTargets -from QuestionDialog import QuestionDialog, ErrorDialog +from QuestionDialog import QuestionDialog from Editors import EditEvent, DelEventQuery #------------------------------------------------------------------------- diff --git a/src/DataViews/_FamilyList.py b/src/DataViews/_FamilyList.py index 224064238..092c5b1e5 100644 --- a/src/DataViews/_FamilyList.py +++ b/src/DataViews/_FamilyList.py @@ -19,14 +19,6 @@ # $Id$ -#------------------------------------------------------------------------- -# -# GTK/Gnome modules -# -#------------------------------------------------------------------------- -import gtk -import gtk.gdk - #------------------------------------------------------------------------- # # gramps modules @@ -36,9 +28,7 @@ import RelLib import PageView import DisplayModels import Bookmarks -import const import Errors -from QuestionDialog import QuestionDialog, ErrorDialog #------------------------------------------------------------------------- # diff --git a/src/DataViews/_MediaView.py b/src/DataViews/_MediaView.py index df8818d24..11b346e26 100644 --- a/src/DataViews/_MediaView.py +++ b/src/DataViews/_MediaView.py @@ -32,7 +32,6 @@ from gettext import gettext as _ # #------------------------------------------------------------------------- import gtk -import gtk.gdk #------------------------------------------------------------------------- # @@ -47,7 +46,7 @@ import Utils import Bookmarks from Editors import EditMedia import Errors -from QuestionDialog import QuestionDialog, ErrorDialog +from QuestionDialog import QuestionDialog column_names = [ _('Title'), diff --git a/src/DataViews/_PersonView.py b/src/DataViews/_PersonView.py index 9e940140c..083f01cc0 100644 --- a/src/DataViews/_PersonView.py +++ b/src/DataViews/_PersonView.py @@ -51,7 +51,6 @@ from gtk.gdk import ACTION_COPY, BUTTON1_MASK import RelLib from DisplayModels import PeopleModel import PageView -import GrampsWidgets import NameDisplay import Utils import QuestionDialog @@ -59,10 +58,9 @@ import TreeTips import Errors import Config import const -from QuestionDialog import ErrorDialog from Editors import EditPerson -from Filters import SearchBar, GenericFilter, PersonSidebarFilter +from Filters import SearchBar, PersonSidebarFilter from DdTargets import DdTargets column_names = [ @@ -147,7 +145,7 @@ class PersonView(PageView.PersonNavView): mlist = self.get_selected_objects() if len(mlist) != 2: - ErrorDialog( + QuestionDialog.ErrorDialog( _("Cannot merge people"), _("Exactly two people must be selected to perform a merge. " "A second person can be selected by holding down the " @@ -159,7 +157,7 @@ class PersonView(PageView.PersonNavView): if p1 and p2: Merge.PersonCompare(self.dbstate, self.uistate, p1, p2) else: - ErrorDialog( + QuestionDialog.ErrorDialog( _("Cannot merge people"), _("Exactly two people must be selected to perform a " "merge. A second person can be selected by holding " @@ -170,7 +168,7 @@ class PersonView(PageView.PersonNavView): mlist = self.get_selected_objects() if len(mlist) != 2: - ErrorDialog( + QuestionDialog.ErrorDialog( _("Cannot merge people"), _("Exactly two people must be selected to perform a merge. " "A second person can be selected by holding down the " @@ -183,7 +181,7 @@ class PersonView(PageView.PersonNavView): if p1 and p2: Merge.MergePeopleUI(self.dbstate, self.uistate, p1, p2) else: - ErrorDialog( + QuestionDialog.ErrorDialog( _("Cannot merge people"), _("Exactly two people must be selected to perform a merge. " "A second person can be selected by holding down the " diff --git a/src/DataViews/_PlaceView.py b/src/DataViews/_PlaceView.py index aa0ea1acd..1c649272e 100644 --- a/src/DataViews/_PlaceView.py +++ b/src/DataViews/_PlaceView.py @@ -25,7 +25,6 @@ # #------------------------------------------------------------------------- import gtk -import gtk.gdk #------------------------------------------------------------------------- # @@ -35,7 +34,6 @@ import gtk.gdk import RelLib import PageView import DisplayModels -import const import Utils import Errors import Bookmarks diff --git a/src/DataViews/_RepositoryView.py b/src/DataViews/_RepositoryView.py index ffd588189..ae3431ce6 100644 --- a/src/DataViews/_RepositoryView.py +++ b/src/DataViews/_RepositoryView.py @@ -25,7 +25,6 @@ # #------------------------------------------------------------------------- import gtk -import gtk.gdk #------------------------------------------------------------------------- # @@ -35,14 +34,13 @@ import gtk.gdk import RelLib import PageView import DisplayModels -import const import Utils import Bookmarks import Errors from Editors import EditRepository, DelRepositoryQuery from DdTargets import DdTargets -from QuestionDialog import QuestionDialog, ErrorDialog +from QuestionDialog import QuestionDialog #------------------------------------------------------------------------- # diff --git a/src/DataViews/_SourceView.py b/src/DataViews/_SourceView.py index f0b75f807..29f559faa 100644 --- a/src/DataViews/_SourceView.py +++ b/src/DataViews/_SourceView.py @@ -25,7 +25,6 @@ # #------------------------------------------------------------------------- import gtk -import gtk.gdk #------------------------------------------------------------------------- # @@ -35,7 +34,6 @@ import gtk.gdk import RelLib import PageView import DisplayModels -import const import Utils import Bookmarks import Errors diff --git a/src/DisplayModels/_EventModel.py b/src/DisplayModels/_EventModel.py index b54fc3efc..7b3162649 100644 --- a/src/DisplayModels/_EventModel.py +++ b/src/DisplayModels/_EventModel.py @@ -27,6 +27,7 @@ import time import logging log = logging.getLogger(".") + try: set() except: @@ -44,7 +45,6 @@ import gtk # GRAMPS modules # #------------------------------------------------------------------------- -import const import ToolTips import GrampsLocale import DateHandler diff --git a/src/DisplayModels/_PeopleModel.py b/src/DisplayModels/_PeopleModel.py index b4079a066..9fc10222c 100644 --- a/src/DisplayModels/_PeopleModel.py +++ b/src/DisplayModels/_PeopleModel.py @@ -38,11 +38,6 @@ import cgi import sys import locale -try: - set() -except: - from sets import Set as set - #------------------------------------------------------------------------- # # set up logging diff --git a/src/DisplayModels/_RepositoryModel.py b/src/DisplayModels/_RepositoryModel.py index d670dc71a..2d649e761 100644 --- a/src/DisplayModels/_RepositoryModel.py +++ b/src/DisplayModels/_RepositoryModel.py @@ -24,7 +24,6 @@ # python modules # #------------------------------------------------------------------------- -import time import logging log = logging.getLogger(".") @@ -45,9 +44,6 @@ import gtk # GRAMPS modules # #------------------------------------------------------------------------- -import const -import ToolTips -import GrampsLocale import RelLib from _BaseModel import BaseModel @@ -220,8 +216,3 @@ class RepositoryModel(BaseModel): def column_tooltip(self,data): return "" -# try: -# t = ToolTips.TipFromFunction(self.db, lambda: self.db.get_repository_from_handle(data[0])) -# except: -# log.error("Failed to create tooltip.", exc_info=True) -# return t diff --git a/src/DisplayTabs/_DataEmbedList.py b/src/DisplayTabs/_DataEmbedList.py index aa52528e9..e7a0f39bb 100644 --- a/src/DisplayTabs/_DataEmbedList.py +++ b/src/DisplayTabs/_DataEmbedList.py @@ -32,7 +32,6 @@ from gettext import gettext as _ # GRAMPS classes # #------------------------------------------------------------------------- -from DdTargets import DdTargets from _DataModel import DataModel from _EmbeddedList import EmbeddedList diff --git a/src/DisplayTabs/_EventBackRefList.py b/src/DisplayTabs/_EventBackRefList.py index ecdedb21a..4ba74fc7c 100644 --- a/src/DisplayTabs/_EventBackRefList.py +++ b/src/DisplayTabs/_EventBackRefList.py @@ -20,13 +20,6 @@ # $Id$ -#------------------------------------------------------------------------- -# -# Python classes -# -#------------------------------------------------------------------------- -from gettext import gettext as _ - #------------------------------------------------------------------------- # # GRAMPS classes diff --git a/src/DisplayTabs/_FamilyAttrEmbedList.py b/src/DisplayTabs/_FamilyAttrEmbedList.py index 983501074..7ab02ded2 100644 --- a/src/DisplayTabs/_FamilyAttrEmbedList.py +++ b/src/DisplayTabs/_FamilyAttrEmbedList.py @@ -20,13 +20,6 @@ # $Id$ -#------------------------------------------------------------------------- -# -# Python classes -# -#------------------------------------------------------------------------- -from gettext import gettext as _ - #------------------------------------------------------------------------- # # GRAMPS classes diff --git a/src/DisplayTabs/_LdsModel.py b/src/DisplayTabs/_LdsModel.py index a99772101..5d2bde992 100644 --- a/src/DisplayTabs/_LdsModel.py +++ b/src/DisplayTabs/_LdsModel.py @@ -20,6 +20,13 @@ # $Id$ +#------------------------------------------------------------------------- +# +# python libraries +# +#------------------------------------------------------------------------- +from gettext import gettext as _ + #------------------------------------------------------------------------- # # GTK libraries diff --git a/src/DisplayTabs/_MediaBackRefList.py b/src/DisplayTabs/_MediaBackRefList.py index 181a37079..a5a27a265 100644 --- a/src/DisplayTabs/_MediaBackRefList.py +++ b/src/DisplayTabs/_MediaBackRefList.py @@ -20,13 +20,6 @@ # $Id$ -#------------------------------------------------------------------------- -# -# Python classes -# -#------------------------------------------------------------------------- -from gettext import gettext as _ - #------------------------------------------------------------------------- # # GRAMPS classes diff --git a/src/DisplayTabs/_PersonEventEmbedList.py b/src/DisplayTabs/_PersonEventEmbedList.py index 3b17bf806..f99baa5c6 100644 --- a/src/DisplayTabs/_PersonEventEmbedList.py +++ b/src/DisplayTabs/_PersonEventEmbedList.py @@ -20,20 +20,12 @@ # $Id$ -#------------------------------------------------------------------------- -# -# Python classes -# -#------------------------------------------------------------------------- -from gettext import gettext as _ - #------------------------------------------------------------------------- # # GRAMPS classes # #------------------------------------------------------------------------- import RelLib -from DdTargets import DdTargets from _EventEmbedList import EventEmbedList _std_types = [ diff --git a/src/DisplayTabs/_PlaceBackRefList.py b/src/DisplayTabs/_PlaceBackRefList.py index 788b45dee..2cfb0d5d7 100644 --- a/src/DisplayTabs/_PlaceBackRefList.py +++ b/src/DisplayTabs/_PlaceBackRefList.py @@ -20,13 +20,6 @@ # $Id$ -#------------------------------------------------------------------------- -# -# Python classes -# -#------------------------------------------------------------------------- -from gettext import gettext as _ - #------------------------------------------------------------------------- # # GRAMPS classes diff --git a/src/DisplayTabs/_SourceBackRefList.py b/src/DisplayTabs/_SourceBackRefList.py index 76326368e..3741d1bbb 100644 --- a/src/DisplayTabs/_SourceBackRefList.py +++ b/src/DisplayTabs/_SourceBackRefList.py @@ -20,13 +20,6 @@ # $Id$ -#------------------------------------------------------------------------- -# -# Python classes -# -#------------------------------------------------------------------------- -from gettext import gettext as _ - #------------------------------------------------------------------------- # # GRAMPS classes diff --git a/src/Editors/_EditAttribute.py b/src/Editors/_EditAttribute.py index 71ec88b6f..2f774d1dc 100644 --- a/src/Editors/_EditAttribute.py +++ b/src/Editors/_EditAttribute.py @@ -48,8 +48,6 @@ import gtk.glade # #------------------------------------------------------------------------- import const -import RelLib -import GrampsDisplay from _EditSecondary import EditSecondary from DisplayTabs import SourceEmbedList, NoteTab diff --git a/src/Editors/_EditChildRef.py b/src/Editors/_EditChildRef.py index effaccfb6..ddc3c7f3f 100644 --- a/src/Editors/_EditChildRef.py +++ b/src/Editors/_EditChildRef.py @@ -45,7 +45,6 @@ import gtk.glade # #------------------------------------------------------------------------- import const -import RelLib from _EditSecondary import EditSecondary from DisplayTabs import SourceEmbedList, NoteTab diff --git a/src/Editors/_EditEvent.py b/src/Editors/_EditEvent.py index bd4ec81ca..2d0781bae 100644 --- a/src/Editors/_EditEvent.py +++ b/src/Editors/_EditEvent.py @@ -27,18 +27,12 @@ #------------------------------------------------------------------------- from gettext import gettext as _ -try: - set() -except: - from sets import Set as set - #------------------------------------------------------------------------- # # GTK/Gnome modules # #------------------------------------------------------------------------- import gtk -import gtk.glade #------------------------------------------------------------------------- # @@ -46,12 +40,11 @@ import gtk.glade # #------------------------------------------------------------------------- import const -import AutoComp import RelLib import GrampsDisplay from _EditPrimary import EditPrimary -from QuestionDialog import WarningDialog, ErrorDialog +from QuestionDialog import ErrorDialog from DisplayTabs import SourceEmbedList, NoteTab, GalleryTab, EventBackRefList from GrampsWidgets import * diff --git a/src/Editors/_EditEventRef.py b/src/Editors/_EditEventRef.py index 82a0a3426..f17ffaa15 100644 --- a/src/Editors/_EditEventRef.py +++ b/src/Editors/_EditEventRef.py @@ -27,18 +27,12 @@ #------------------------------------------------------------------------- from gettext import gettext as _ -try: - set() -except: - from sets import Set as set - #------------------------------------------------------------------------- # # GTK/Gnome modules # #------------------------------------------------------------------------- import gtk -import gtk.glade #------------------------------------------------------------------------- # diff --git a/src/Editors/_EditFamily.py b/src/Editors/_EditFamily.py index 07473fb68..cece033cb 100644 --- a/src/Editors/_EditFamily.py +++ b/src/Editors/_EditFamily.py @@ -52,9 +52,7 @@ log = logging.getLogger(".") # GTK/Gnome modules # #------------------------------------------------------------------------- -import gobject import gtk -import gtk.glade #------------------------------------------------------------------------- # @@ -64,10 +62,7 @@ import gtk.glade import const import Utils import NameDisplay -import Spell -import GrampsDisplay import RelLib -import AutoComp import Config import Errors diff --git a/src/Editors/_EditLdsOrd.py b/src/Editors/_EditLdsOrd.py index 76485e799..ad11501da 100644 --- a/src/Editors/_EditLdsOrd.py +++ b/src/Editors/_EditLdsOrd.py @@ -49,7 +49,6 @@ import gtk.glade #------------------------------------------------------------------------- import const import RelLib -import GrampsDisplay import NameDisplay import LdsUtils diff --git a/src/Editors/_EditLocation.py b/src/Editors/_EditLocation.py index 3bea4da03..239e72b91 100644 --- a/src/Editors/_EditLocation.py +++ b/src/Editors/_EditLocation.py @@ -26,7 +26,6 @@ # #------------------------------------------------------------------------- import gtk -import gtk.glade #------------------------------------------------------------------------- # diff --git a/src/Editors/_EditMedia.py b/src/Editors/_EditMedia.py index feb23f727..d20bf03ce 100644 --- a/src/Editors/_EditMedia.py +++ b/src/Editors/_EditMedia.py @@ -33,9 +33,7 @@ import os # GTK/Gnome modules # #------------------------------------------------------------------------- -import gobject import gtk -import gtk.glade #------------------------------------------------------------------------- # @@ -49,7 +47,6 @@ import ImgManip from _EditPrimary import EditPrimary from GrampsWidgets import * -from QuestionDialog import ErrorDialog from DisplayTabs import SourceEmbedList,AttrEmbedList,NoteTab,MediaBackRefList #------------------------------------------------------------------------- diff --git a/src/Editors/_EditMediaRef.py b/src/Editors/_EditMediaRef.py index 5cc0f1771..6d70080b6 100644 --- a/src/Editors/_EditMediaRef.py +++ b/src/Editors/_EditMediaRef.py @@ -32,9 +32,7 @@ from gettext import gettext as _ # GTK/Gnome modules # #------------------------------------------------------------------------- -import gobject import gtk -import gtk.glade #------------------------------------------------------------------------- # @@ -42,7 +40,6 @@ import gtk.glade # #------------------------------------------------------------------------- import const -import RelLib import Mime import ImgManip diff --git a/src/Editors/_EditPerson.py b/src/Editors/_EditPerson.py index df867c057..1570bdb0c 100644 --- a/src/Editors/_EditPerson.py +++ b/src/Editors/_EditPerson.py @@ -42,8 +42,6 @@ from gettext import gettext as _ # #------------------------------------------------------------------------- import gtk -import gtk.glade -import gtk.gdk try: set() @@ -60,7 +58,6 @@ import Utils import Mime import RelLib import GrampsWidgets -import Config from GrampsDb import set_birth_death_index @@ -140,16 +137,6 @@ class EditPerson(EditPrimary): else: self.surname_field.grab_focus() -# if not Config.get(Config.HIDE_EP_MSG): -# MessageHideDialog( -# _('Editing a person'), -# _('This window allows you to enter information about ' -# 'a person. You can add events, including birth and ' -# 'death information under the Events tab. Similarly, ' -# 'you can add additional information, such as sources, ' -# 'names, and images on other tabs.'), -# Config.HIDE_EP_MSG) - def _connect_signals(self): """ Connects any signals that need to be connected. Called by the diff --git a/src/Editors/_EditPlace.py b/src/Editors/_EditPlace.py index a9e107d22..cf91b82ec 100644 --- a/src/Editors/_EditPlace.py +++ b/src/Editors/_EditPlace.py @@ -35,9 +35,7 @@ log = logging.getLogger(".") # GTK/Gnome modules # #------------------------------------------------------------------------- -import gobject import gtk -import gtk.glade #------------------------------------------------------------------------- # @@ -45,7 +43,6 @@ import gtk.glade # #------------------------------------------------------------------------- import const -import Utils import RelLib from _EditPrimary import EditPrimary diff --git a/src/Editors/_EditReference.py b/src/Editors/_EditReference.py index 73b048b56..6e9c03d0b 100644 --- a/src/Editors/_EditReference.py +++ b/src/Editors/_EditReference.py @@ -20,36 +20,12 @@ # $Id: _EditSourceRef.py 6068 2006-03-04 06:34:48Z dallingham $ -#------------------------------------------------------------------------- -# -# Python modules -# -#------------------------------------------------------------------------- -from gettext import gettext as _ - -try: - set() -except: - from sets import Set as set - -#------------------------------------------------------------------------- -# -# GTK/Gnome modules -# -#------------------------------------------------------------------------- -import gtk -import gtk.glade - #------------------------------------------------------------------------- # # gramps modules # #------------------------------------------------------------------------- -import const -import RelLib import ManagedWindow - -from QuestionDialog import WarningDialog, ErrorDialog from GrampsWidgets import * #------------------------------------------------------------------------- diff --git a/src/Editors/_EditRepoRef.py b/src/Editors/_EditRepoRef.py index ed81430e6..d56c86d0a 100644 --- a/src/Editors/_EditRepoRef.py +++ b/src/Editors/_EditRepoRef.py @@ -27,18 +27,12 @@ #------------------------------------------------------------------------- from gettext import gettext as _ -try: - set() -except: - from sets import Set as set - #------------------------------------------------------------------------- # # GTK/Gnome modules # #------------------------------------------------------------------------- import gtk -import gtk.glade #------------------------------------------------------------------------- # @@ -46,7 +40,6 @@ import gtk.glade # #------------------------------------------------------------------------- import const -import RelLib from DisplayTabs import NoteTab,AddrEmbedList,WebEmbedList,SourceBackRefList from GrampsWidgets import * diff --git a/src/Editors/_EditRepository.py b/src/Editors/_EditRepository.py index 8bfc0b7d0..bfa4f63cc 100644 --- a/src/Editors/_EditRepository.py +++ b/src/Editors/_EditRepository.py @@ -33,7 +33,6 @@ from gettext import gettext as _ # #------------------------------------------------------------------------- import gtk -import gtk.glade #------------------------------------------------------------------------- # diff --git a/src/Editors/_EditSecondary.py b/src/Editors/_EditSecondary.py index 3d7883ffd..4de9fc327 100644 --- a/src/Editors/_EditSecondary.py +++ b/src/Editors/_EditSecondary.py @@ -20,10 +20,7 @@ # $Id$ -from gettext import gettext as _ - import ManagedWindow -import Config import GrampsDisplay class EditSecondary(ManagedWindow.ManagedWindow): diff --git a/src/Editors/_EditSource.py b/src/Editors/_EditSource.py index 05d7d92a6..f2a2f59fd 100644 --- a/src/Editors/_EditSource.py +++ b/src/Editors/_EditSource.py @@ -35,7 +35,6 @@ log = logging.getLogger(".") # GTK/Gnome modules # #------------------------------------------------------------------------- -import gobject import gtk.glade #------------------------------------------------------------------------- @@ -45,9 +44,6 @@ import gtk.glade #------------------------------------------------------------------------- import const import RelLib -import NameDisplay -import Spell -import GrampsDisplay from _EditPrimary import EditPrimary from DisplayTabs import \ diff --git a/src/Editors/_EditSourceRef.py b/src/Editors/_EditSourceRef.py index 446622722..b4c641fc3 100644 --- a/src/Editors/_EditSourceRef.py +++ b/src/Editors/_EditSourceRef.py @@ -27,18 +27,12 @@ #------------------------------------------------------------------------- from gettext import gettext as _ -try: - set() -except: - from sets import Set as set - #------------------------------------------------------------------------- # # GTK/Gnome modules # #------------------------------------------------------------------------- import gtk -import gtk.glade #------------------------------------------------------------------------- # diff --git a/src/Editors/_EditUrl.py b/src/Editors/_EditUrl.py index 2a9a1391e..aaf32d156 100644 --- a/src/Editors/_EditUrl.py +++ b/src/Editors/_EditUrl.py @@ -26,7 +26,6 @@ # #------------------------------------------------------------------------- from gettext import gettext as _ -from cgi import escape #------------------------------------------------------------------------- # diff --git a/src/FilterEditor/_EditFilter.py b/src/FilterEditor/_EditFilter.py index a1fea0fa7..f559da105 100644 --- a/src/FilterEditor/_EditFilter.py +++ b/src/FilterEditor/_EditFilter.py @@ -31,7 +31,6 @@ __author__ = "Don Allingham" # Python modules # #------------------------------------------------------------------------- -import os from gettext import gettext as _ #------------------------------------------------------------------------ @@ -42,25 +41,15 @@ from gettext import gettext as _ import logging log = logging.getLogger(".FilterEdit") -#------------------------------------------------------------------------- -# -# GTK/GNOME -# -#------------------------------------------------------------------------- -import gtk -import GrampsDisplay - #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- import const -import RelLib -from Filters import GenericFilter, FilterList, Rules, \ - reload_custom_filters, reload_system_filters import ListModel import ManagedWindow +import GrampsDisplay #------------------------------------------------------------------------- # diff --git a/src/FilterEditor/_EditRule.py b/src/FilterEditor/_EditRule.py index 1ef0cfd5d..bf7ba1160 100644 --- a/src/FilterEditor/_EditRule.py +++ b/src/FilterEditor/_EditRule.py @@ -31,7 +31,6 @@ __author__ = "Don Allingham" # Python modules # #------------------------------------------------------------------------- -import os from gettext import gettext as _ #------------------------------------------------------------------------ @@ -58,8 +57,7 @@ import GrampsDisplay #------------------------------------------------------------------------- import const import RelLib -from Filters import GenericFilter, FilterList, Rules, \ - reload_custom_filters, reload_system_filters +from Filters import Rules import AutoComp from Selectors import selector_factory SelectPerson = selector_factory('Person') diff --git a/src/FilterEditor/_FilterEditor.py b/src/FilterEditor/_FilterEditor.py index 230f2ddfb..22ba66001 100644 --- a/src/FilterEditor/_FilterEditor.py +++ b/src/FilterEditor/_FilterEditor.py @@ -31,7 +31,6 @@ __author__ = "Don Allingham" # Python modules # #------------------------------------------------------------------------- -import os from gettext import gettext as _ #------------------------------------------------------------------------ @@ -47,7 +46,6 @@ log = logging.getLogger(".FilterEdit") # GTK/GNOME # #------------------------------------------------------------------------- -import gtk import GrampsDisplay #------------------------------------------------------------------------- @@ -56,7 +54,6 @@ import GrampsDisplay # #------------------------------------------------------------------------- import const -import RelLib from Filters import GenericFilter, FilterList, \ reload_custom_filters, reload_system_filters import ListModel diff --git a/src/RelLib/_Attribute.py b/src/RelLib/_Attribute.py index 57ed6a8ef..5372762b1 100644 --- a/src/RelLib/_Attribute.py +++ b/src/RelLib/_Attribute.py @@ -24,13 +24,6 @@ Attribute class for GRAMPS """ -#------------------------------------------------------------------------- -# -# standard python modules -# -#------------------------------------------------------------------------- -from warnings import warn - #------------------------------------------------------------------------- # # GRAMPS modules diff --git a/src/RelLib/_Event.py b/src/RelLib/_Event.py index 2c14546ee..3c8ff0e09 100644 --- a/src/RelLib/_Event.py +++ b/src/RelLib/_Event.py @@ -24,13 +24,6 @@ Event object for GRAMPS """ -#------------------------------------------------------------------------- -# -# standard python modules -# -#------------------------------------------------------------------------- -from warnings import warn - #------------------------------------------------------------------------- # # GRAMPS modules diff --git a/src/RelLib/_EventRef.py b/src/RelLib/_EventRef.py index a33a2bf08..8cf9c3449 100644 --- a/src/RelLib/_EventRef.py +++ b/src/RelLib/_EventRef.py @@ -24,13 +24,6 @@ Event Reference class for GRAMPS """ -#------------------------------------------------------------------------- -# -# standard python modules -# -#------------------------------------------------------------------------- -from warnings import warn - #------------------------------------------------------------------------- # # GRAMPS modules diff --git a/src/RelLib/_Name.py b/src/RelLib/_Name.py index 18fe0edd5..9f9514623 100644 --- a/src/RelLib/_Name.py +++ b/src/RelLib/_Name.py @@ -24,13 +24,6 @@ Name class for GRAMPS """ -#------------------------------------------------------------------------- -# -# standard python modules -# -#------------------------------------------------------------------------- -from warnings import warn - #------------------------------------------------------------------------- # # GRAMPS modules diff --git a/src/RelLib/_Person.py b/src/RelLib/_Person.py index b6a68f9aa..ebd062c0a 100644 --- a/src/RelLib/_Person.py +++ b/src/RelLib/_Person.py @@ -46,7 +46,6 @@ from _LdsOrdBase import LdsOrdBase from _UrlBase import UrlBase from _Name import Name from _EventRef import EventRef -from _LdsOrd import LdsOrd from _PersonRef import PersonRef from _MarkerType import MarkerType from _AttributeType import AttributeType diff --git a/src/RelLib/_Repository.py b/src/RelLib/_Repository.py index 5285f4e0e..42ef87cc9 100644 --- a/src/RelLib/_Repository.py +++ b/src/RelLib/_Repository.py @@ -24,13 +24,6 @@ Repository object for GRAMPS """ -#------------------------------------------------------------------------- -# -# standard python modules -# -#------------------------------------------------------------------------- -from warnings import warn - #------------------------------------------------------------------------- # # GRAMPS modules diff --git a/src/RelLib/_SourceRef.py b/src/RelLib/_SourceRef.py index ef3a63bb5..27b5a7203 100644 --- a/src/RelLib/_SourceRef.py +++ b/src/RelLib/_SourceRef.py @@ -36,7 +36,6 @@ from _DateBase import DateBase from _PrivacyBase import PrivacyBase from _NoteBase import NoteBase from _RefBase import RefBase -from _Note import Note #------------------------------------------------------------------------- #