diff --git a/po/POTFILES.skip b/po/POTFILES.skip index c6979f3b4..08c5c6c79 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -5,7 +5,6 @@ #src src/AutoComp.py -src/Errors.py src/ImgManip.py src/RecentFiles.py src/Sort.py @@ -17,6 +16,7 @@ src/cli/__init__.py src/cli/user.py # gen +src/gen/errors.py src/gen/user.py # gen API diff --git a/src/DateEdit.py b/src/DateEdit.py index aba5d5b31..6b5bc2151 100644 --- a/src/DateEdit.py +++ b/src/DateEdit.py @@ -67,7 +67,7 @@ import gen.datehandler import const from gui.display import display_help from gui.managedwindow import ManagedWindow -from Errors import ValidationError +from gen.errors import ValidationError from gui.glade import Glade #------------------------------------------------------------------------- diff --git a/src/Makefile.am b/src/Makefile.am index f5f668ff8..f5974ea6b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -18,7 +18,6 @@ gdir_PYTHON = \ const.py\ constfunc.py\ DateEdit.py\ - Errors.py\ ExportAssistant.py\ ExportOptions.py\ gramps.py\ diff --git a/src/Utils.py b/src/Utils.py index 524c6f5a2..f09c84a12 100644 --- a/src/Utils.py +++ b/src/Utils.py @@ -48,7 +48,7 @@ LOG = logging.getLogger(".") #------------------------------------------------------------------------- from gen.display.name import displayer as name_displayer import gen.lib -import Errors +from gen.errors import DatabaseError from gen.locale import codeset import gen.datehandler @@ -759,7 +759,7 @@ class ProbablyAlive(object): try: date1, date2, explain, other = descendants_too_old(person, self.AVG_GENERATION_GAP) except RuntimeError: - raise Errors.DatabaseError( + raise DatabaseError( _("Database error: %s is defined as his or her own ancestor") % name_displayer.display(person)) diff --git a/src/cli/grampscli.py b/src/cli/grampscli.py index da62d7e25..9603dbba1 100644 --- a/src/cli/grampscli.py +++ b/src/cli/grampscli.py @@ -48,7 +48,7 @@ LOG = logging.getLogger(".grampscli") from gen.display.name import displayer as name_displayer import config import const -import Errors +from gen.errors import DbError from gen.dbstate import DbState from gen.db import DbBsddb import gen.db.exceptions @@ -164,7 +164,7 @@ class CLIDbLoader(object): self.dbstate.no_database() self._errordialog( _("Could not open file: %s") % filename, str(msg)) - except Errors.DbError, msg: + except DbError, msg: self.dbstate.no_database() self._dberrordialog(msg) except Exception: diff --git a/src/cli/plug/__init__.py b/src/cli/plug/__init__.py index fbf6e9b89..1252769f4 100644 --- a/src/cli/plug/__init__.py +++ b/src/cli/plug/__init__.py @@ -55,7 +55,7 @@ from gen.plug.menu import (FamilyOption, PersonOption, NoteOption, BooleanOption, DestinationOption, StringOption, TextOption, EnumeratedListOption, Option) from gen.display.name import displayer as name_displayer -from Errors import ReportError +from gen.errors import ReportError from gen.plug.report import (CATEGORY_TEXT, CATEGORY_DRAW, CATEGORY_BOOK, CATEGORY_GRAPHVIZ, CATEGORY_CODE) from gen.plug.report._paper import paper_sizes diff --git a/src/docgen/ODSTab.py b/src/docgen/ODSTab.py index caf6321da..e3bdad3e9 100644 --- a/src/docgen/ODSTab.py +++ b/src/docgen/ODSTab.py @@ -39,7 +39,7 @@ from TabbedDoc import * import const -import Errors +from gen.errors import ReportError #------------------------------------------------------------------------- # @@ -340,9 +340,9 @@ class ODSTab(TabbedDoc): self.content_xml = tempfile.mktemp() self.f = open(self.content_xml,"wb") except IOError,msg: - raise Errors.ReportError(_("Could not create %s") % self.content_xml, msg) + raise ReportError(_("Could not create %s") % self.content_xml, msg) except: - raise Errors.ReportError(_("Could not create %s") % self.content_xml) + raise ReportError(_("Could not create %s") % self.content_xml) self.f = open(self.content_xml,"w") self.f.write( @@ -403,9 +403,9 @@ class ODSTab(TabbedDoc): file = zipfile.ZipFile(self.filename,"w",zipfile.ZIP_DEFLATED) except IOError,msg: errmsg = "%s\n%s" % (_("Could not create %s") % self.filename, msg) - raise Errors.ReportError(errmsg) + raise ReportError(errmsg) except: - raise Errors.ReportError(_("Could not create %s") % self.filename) + raise ReportError(_("Could not create %s") % self.filename) file.write(self.manifest_xml,str("META-INF/manifest.xml")) file.write(self.content_xml,str("content.xml")) @@ -426,10 +426,10 @@ class ODSTab(TabbedDoc): self.f = open(self.styles_xml,"wb") except IOError,msg: errmsg = "%s\n%s" % (_("Could not create %s") % self.styles_xml, msg) - raise Errors.ReportError(errmsg) + raise ReportError(errmsg) except: pass - raise Errors.ReportError(_("Could not create %s") % self.styles_xml) + raise ReportError(_("Could not create %s") % self.styles_xml) self.f = open(self.styles_xml,"w") self.f.write('\n') @@ -461,10 +461,10 @@ class ODSTab(TabbedDoc): self.f = open(self.manifest_xml,"wb") except IOError,msg: errmsg = "%s\n%s" % (_("Could not create %s") % self.manifest_xml, msg) - raise Errors.ReportError(errmsg) + raise ReportError(errmsg) except: pass - raise Errors.ReportError(_("Could not create %s") % self.manifest_xml) + raise ReportError(_("Could not create %s") % self.manifest_xml) self.f = open(self.manifest_xml,"w") self.f.write(_MANIFEST) @@ -477,10 +477,10 @@ class ODSTab(TabbedDoc): self.f = open(self.meta_xml,"wb") except IOError,msg: errmsg = "%s\n%s" % (_("Could not create %s") % self.meta_xml, msg) - raise Errors.ReportError(errmsg) + raise ReportError(errmsg) except: pass - raise Errors.ReportError(_("Could not create %s") % self.meta_xml) + raise ReportError(_("Could not create %s") % self.meta_xml) self.f = open(self.meta_xml,"w") @@ -500,10 +500,10 @@ class ODSTab(TabbedDoc): self.f = open(self.mimetype,"wb") except IOError,msg: errmsg = "%s\n%s" % (_("Could not create %s") % self.mimetype, msg) - raise Errors.ReportError(errmsg) + raise ReportError(errmsg) except: pass - raise Errors.ReportError(_("Could not create %s") % self.mimetype) + raise ReportError(_("Could not create %s") % self.mimetype) self.f = open(self.mimetype,"w") self.f.write('application/vnd.oasis.opendocument.spreadsheet') diff --git a/src/gen/Makefile.am b/src/gen/Makefile.am index ddc7f3953..40db4a373 100644 --- a/src/gen/Makefile.am +++ b/src/gen/Makefile.am @@ -23,6 +23,7 @@ pkgpythondir = $(datadir)/@PACKAGE@/gen pkgpython_PYTHON = \ __init__.py \ dbstate.py \ + errors.py \ ggettext.py \ updatecallback.py \ user.py diff --git a/src/gen/db/read.py b/src/gen/db/read.py index deb568cd8..22a7fce71 100644 --- a/src/gen/db/read.py +++ b/src/gen/db/read.py @@ -60,7 +60,7 @@ from gen.db.dbconst import * from gen.utils.callback import Callback from gen.db import (BsddbBaseCursor, DbReadBase) from Utils import create_id -import Errors +from gen.errors import DbError LOG = logging.getLogger(DBLOGNAME) LOG = logging.getLogger(".citation") @@ -418,7 +418,7 @@ class DbBsddbRead(DbReadBase, Callback): return DbReadCursor(table, self.txn) except DBERRS, msg: self.__log_error() - raise Errors.DbError(msg) + raise DbError(msg) def get_person_cursor(self, *args, **kwargs): return self.get_cursor(self.person_map, *args, **kwargs) @@ -727,7 +727,7 @@ class DbBsddbRead(DbReadBase, Callback): return None except DBERRS, msg: self.__log_error() - raise Errors.DbError(msg) + raise DbError(msg) def get_person_from_gramps_id(self, val): """ @@ -1472,7 +1472,7 @@ class DbBsddbRead(DbReadBase, Callback): return table.get(str(handle), txn=self.txn) except DBERRS, msg: self.__log_error() - raise Errors.DbError(msg) + raise DbError(msg) def get_raw_person_data(self, handle): return self.__get_raw_data(self.person_map, handle) @@ -1512,7 +1512,7 @@ class DbBsddbRead(DbReadBase, Callback): return table.get(str(handle), txn=self.txn) is not None except DBERRS, msg: self.__log_error() - raise Errors.DbError(msg) + raise DbError(msg) def has_person_handle(self, handle): """ diff --git a/src/gen/db/undoredo.py b/src/gen/db/undoredo.py index d3fe0ad7f..9f5cb0aec 100644 --- a/src/gen/db/undoredo.py +++ b/src/gen/db/undoredo.py @@ -50,7 +50,7 @@ from gen.ggettext import gettext as _ #------------------------------------------------------------------------- from gen.db.dbconst import * from gen.db import BSDDBTxn -import Errors +from gen.errors import DbError #------------------------------------------------------------------------- # @@ -209,7 +209,7 @@ class DbUndo(object): except DBERRS, msg: self.db._log_error() - raise Errors.DbError(msg) + raise DbError(msg) return try_ @@ -302,7 +302,7 @@ class DbUndo(object): except DBERRS, msg: self.db._log_error() - raise Errors.DbError(msg) + raise DbError(msg) def undo_data(self, data, handle, db_map, emit, signal_root): """ @@ -323,7 +323,7 @@ class DbUndo(object): except DBERRS, msg: self.db._log_error() - raise Errors.DbError(msg) + raise DbError(msg) undo_count = property(lambda self:len(self.undoq)) redo_count = property(lambda self:len(self.redoq)) diff --git a/src/gen/db/write.py b/src/gen/db/write.py index bf1d1c8a6..00299c6bf 100644 --- a/src/gen/db/write.py +++ b/src/gen/db/write.py @@ -63,7 +63,7 @@ from gen.db import (DbBsddbRead, DbWriteBase, BSDDBTxn, from gen.db.dbconst import * from gen.utils.callback import Callback from gen.updatecallback import UpdateCallback -import Errors +from gen.errors import DbError import constfunc _LOG = logging.getLogger(DBLOGNAME) @@ -245,7 +245,7 @@ class DbBsddb(DbBsddbRead, DbWriteBase, UpdateCallback): return func(self, *args, **kwargs) except DBERRS, msg: self.__log_error() - raise Errors.DbError(msg) + raise DbError(msg) return try_ def __open_db(self, file_name, table_name, dbtype=db.DB_HASH, flags=0): @@ -1737,7 +1737,7 @@ class DbBsddb(DbBsddbRead, DbWriteBase, UpdateCallback): if self.txn is not None: msg = self.transaction.get_description() self.transaction_abort(self.transaction) - raise Errors.DbError(_('A second transaction is started while there' + raise DbError(_('A second transaction is started while there' ' is still a transaction, "%s", active in the database.') % msg) if not isinstance(transaction, DbTxn) or len(transaction) != 0: diff --git a/src/Errors.py b/src/gen/errors.py similarity index 100% rename from src/Errors.py rename to src/gen/errors.py diff --git a/src/gen/filters/_paramfilter.py b/src/gen/filters/_paramfilter.py index 55d48060f..88903f0e5 100644 --- a/src/gen/filters/_paramfilter.py +++ b/src/gen/filters/_paramfilter.py @@ -30,7 +30,7 @@ Package providing filtering framework for GRAMPS. # #------------------------------------------------------------------------- from gen.filters._genericfilter import GenericFilter -from Errors import FilterError +from gen.errors import FilterError #------------------------------------------------------------------------- # diff --git a/src/gen/merge/mergecitationquery.py b/src/gen/merge/mergecitationquery.py index 7509099ad..b5910d05f 100644 --- a/src/gen/merge/mergecitationquery.py +++ b/src/gen/merge/mergecitationquery.py @@ -33,7 +33,7 @@ Provide merge capabilities for citations. from gen.lib import (Person, Family, Event, Place, MediaObject, Repository) from gen.db import DbTxn from gen.ggettext import sgettext as _ -from Errors import MergeError +from gen.errors import MergeError #------------------------------------------------------------------------- # diff --git a/src/gen/merge/mergeeventquery.py b/src/gen/merge/mergeeventquery.py index 23a05b1e3..e1b1e3b90 100644 --- a/src/gen/merge/mergeeventquery.py +++ b/src/gen/merge/mergeeventquery.py @@ -32,7 +32,7 @@ Provide merge capabilities for events. from gen.lib import Person, Family from gen.db import DbTxn from gen.ggettext import sgettext as _ -from Errors import MergeError +from gen.errors import MergeError #------------------------------------------------------------------------- # diff --git a/src/gen/merge/mergefamilyquery.py b/src/gen/merge/mergefamilyquery.py index 275dd5450..b0c445e78 100644 --- a/src/gen/merge/mergefamilyquery.py +++ b/src/gen/merge/mergefamilyquery.py @@ -31,7 +31,7 @@ Provide merge capabilities for families. #------------------------------------------------------------------------- from gen.db import DbTxn from gen.ggettext import sgettext as _ -from Errors import MergeError +from gen.errors import MergeError from gen.merge import MergePersonQuery #------------------------------------------------------------------------- diff --git a/src/gen/merge/mergemediaquery.py b/src/gen/merge/mergemediaquery.py index 2648ee250..de35a6798 100644 --- a/src/gen/merge/mergemediaquery.py +++ b/src/gen/merge/mergemediaquery.py @@ -32,7 +32,7 @@ Provide merge capabilities for media objects. from gen.lib import Person, Family, Event, Source, Citation, Place from gen.db import DbTxn from gen.ggettext import sgettext as _ -from Errors import MergeError +from gen.errors import MergeError #------------------------------------------------------------------------- # diff --git a/src/gen/merge/mergenotequery.py b/src/gen/merge/mergenotequery.py index 59b8a8496..8e2ca81c0 100644 --- a/src/gen/merge/mergenotequery.py +++ b/src/gen/merge/mergenotequery.py @@ -33,7 +33,7 @@ from gen.lib import (Person, Family, Event, Place, Source, Citation, Repository, MediaObject) from gen.db import DbTxn from gen.ggettext import sgettext as _ -from Errors import MergeError +from gen.errors import MergeError #------------------------------------------------------------------------- # diff --git a/src/gen/merge/mergepersonquery.py b/src/gen/merge/mergepersonquery.py index 95882b7d8..e658b2e47 100644 --- a/src/gen/merge/mergepersonquery.py +++ b/src/gen/merge/mergepersonquery.py @@ -33,7 +33,7 @@ Provide merge capabilities for persons. #------------------------------------------------------------------------- from gen.db import DbTxn from gen.ggettext import sgettext as _ -from Errors import MergeError +from gen.errors import MergeError #------------------------------------------------------------------------- # diff --git a/src/gen/merge/mergeplacequery.py b/src/gen/merge/mergeplacequery.py index 58dab3301..c4307dc5d 100644 --- a/src/gen/merge/mergeplacequery.py +++ b/src/gen/merge/mergeplacequery.py @@ -33,7 +33,7 @@ Provide merge capabilities for places. from gen.lib import Person, Family, Event from gen.db import DbTxn from gen.ggettext import sgettext as _ -from Errors import MergeError +from gen.errors import MergeError #------------------------------------------------------------------------- # diff --git a/src/gen/merge/mergerepositoryquery.py b/src/gen/merge/mergerepositoryquery.py index 527c84161..d53e0233d 100644 --- a/src/gen/merge/mergerepositoryquery.py +++ b/src/gen/merge/mergerepositoryquery.py @@ -32,7 +32,7 @@ Provide merge capabilities for repositories. from gen.lib import Source from gen.db import DbTxn from gen.ggettext import sgettext as _ -from Errors import MergeError +from gen.errors import MergeError #------------------------------------------------------------------------- # diff --git a/src/gen/merge/mergesourcequery.py b/src/gen/merge/mergesourcequery.py index 8537e3344..c265add48 100644 --- a/src/gen/merge/mergesourcequery.py +++ b/src/gen/merge/mergesourcequery.py @@ -35,7 +35,7 @@ from gen.lib import (Person, Family, Event, Place, Source, Repository, MediaObject, Citation) from gen.db import DbTxn from gen.ggettext import sgettext as _ -from Errors import MergeError +from gen.errors import MergeError #------------------------------------------------------------------------- # diff --git a/src/gui/clipboard.py b/src/gui/clipboard.py index e53fe4cf1..bd6cf74bb 100644 --- a/src/gui/clipboard.py +++ b/src/gui/clipboard.py @@ -1507,7 +1507,7 @@ class MultiTreeView(gtk.TreeView): try: EditPerson(self.dbstate, self.uistate, [], person) - except Errors.WindowActiveError: + except WindowActiveError: pass elif objclass == 'Event': event = self.dbstate.db.get_event_from_handle(handle) @@ -1515,7 +1515,7 @@ class MultiTreeView(gtk.TreeView): try: EditEvent(self.dbstate, self.uistate, [], event) - except Errors.WindowActiveError: + except WindowActiveError: pass elif objclass == 'Family': ref = self.dbstate.db.get_family_from_handle(handle) @@ -1523,7 +1523,7 @@ class MultiTreeView(gtk.TreeView): try: EditFamily(self.dbstate, self.uistate, [], ref) - except Errors.WindowActiveError: + except WindowActiveError: pass elif objclass == 'Source': ref = self.dbstate.db.get_source_from_handle(handle) @@ -1531,7 +1531,7 @@ class MultiTreeView(gtk.TreeView): try: EditSource(self.dbstate, self.uistate, [], ref) - except Errors.WindowActiveError: + except WindowActiveError: pass elif objclass == 'Place': ref = self.dbstate.db.get_place_from_handle(handle) @@ -1539,7 +1539,7 @@ class MultiTreeView(gtk.TreeView): try: EditPlace(self.dbstate, self.uistate, [], ref) - except Errors.WindowActiveError: + except WindowActiveError: pass elif objclass == 'Repository': ref = self.dbstate.db.get_repository_from_handle(handle) @@ -1547,7 +1547,7 @@ class MultiTreeView(gtk.TreeView): try: EditRepository(self.dbstate, self.uistate, [], ref) - except Errors.WindowActiveError: + except WindowActiveError: pass elif objclass == 'Note': ref = self.dbstate.db.get_note_from_handle(handle) @@ -1555,7 +1555,7 @@ class MultiTreeView(gtk.TreeView): try: EditNote(self.dbstate, self.uistate, [], ref) - except Errors.WindowActiveError: + except WindowActiveError: pass elif objclass in ['Media', 'MediaObject']: ref = self.dbstate.db.get_object_from_handle(handle) @@ -1563,7 +1563,7 @@ class MultiTreeView(gtk.TreeView): try: EditMedia(self.dbstate, self.uistate, [], ref) - except Errors.WindowActiveError: + except WindowActiveError: pass def short(val,size=60): diff --git a/src/gui/configure.py b/src/gui/configure.py index d68351e70..537c66637 100644 --- a/src/gui/configure.py +++ b/src/gui/configure.py @@ -156,7 +156,7 @@ class ConfigureDialog(ManagedWindow): configuration page :param configobj: the unique object that is configured, it must be identifiable (id(configobj)). If the configure dialog of the - configobj is already open, a Errors.WindowActiveError will be + configobj is already open, a WindowActiveError will be raised. Grab this exception in the calling method :param configmanager: a configmanager object. Several convenience methods are present in ConfigureDialog to set up widgets that diff --git a/src/gui/dbloader.py b/src/gui/dbloader.py index b0481b11c..3ed7189d5 100644 --- a/src/gui/dbloader.py +++ b/src/gui/dbloader.py @@ -62,7 +62,7 @@ from gui.pluginmanager import GuiPluginManager from gui.dialog import (DBErrorDialog, ErrorDialog, QuestionDialog2, WarningDialog) from gui.user import User -import Errors +from gen.errors import DbError #------------------------------------------------------------------------- # @@ -323,7 +323,7 @@ class DbLoader(CLIDbLoader): self.dbstate.no_database() self._errordialog( _("Could not open file: %s") % filename, str(msg)) - except Errors.DbError, msg: + except DbError, msg: self.dbstate.no_database() self._dberrordialog(msg) except Exception as newerror: diff --git a/src/gui/editors/displaytabs/addrembedlist.py b/src/gui/editors/displaytabs/addrembedlist.py index fd58a7967..3127425b0 100644 --- a/src/gui/editors/displaytabs/addrembedlist.py +++ b/src/gui/editors/displaytabs/addrembedlist.py @@ -38,7 +38,7 @@ import gobject # #------------------------------------------------------------------------- import gen.lib -import Errors +from gen.errors import WindowActiveError from gui.ddtargets import DdTargets from addressmodel import AddressModel from embeddedlist import EmbeddedList @@ -104,7 +104,7 @@ class AddrEmbedList(EmbeddedList): """ Called when the Add button is clicked. Creates a new Address instance and calls the EditAddress editor with the new address. If the window - already exists (Errors.WindowActiveError), we ignore it. This prevents + already exists (WindowActiveError), we ignore it. This prevents the dialog from coming up twice on the same object. """ addr = gen.lib.Address() @@ -112,7 +112,7 @@ class AddrEmbedList(EmbeddedList): from gui.editors import EditAddress EditAddress(self.dbstate, self.uistate, self.track, addr, self.add_callback) - except Errors.WindowActiveError: + except WindowActiveError: return def add_callback(self, name): @@ -128,7 +128,7 @@ class AddrEmbedList(EmbeddedList): """ Called with the Edit button is clicked. Gets the selected Address instance and calls the EditAddress editor with the address. If the window - already exists (Errors.WindowActiveError), we ignore it. This prevents + already exists (WindowActiveError), we ignore it. This prevents the dialog from coming up twice on the same object. """ addr = self.get_selected() @@ -137,7 +137,7 @@ class AddrEmbedList(EmbeddedList): from gui.editors import EditAddress EditAddress(self.dbstate, self.uistate, self.track, addr, self.edit_callback) - except Errors.WindowActiveError: + except WindowActiveError: return def edit_callback(self, name): diff --git a/src/gui/editors/displaytabs/attrembedlist.py b/src/gui/editors/displaytabs/attrembedlist.py index f926c9acf..a0c2193f9 100644 --- a/src/gui/editors/displaytabs/attrembedlist.py +++ b/src/gui/editors/displaytabs/attrembedlist.py @@ -34,7 +34,7 @@ import gobject # #------------------------------------------------------------------------- import gen.lib -import Errors +from gen.errors import WindowActiveError from gui.ddtargets import DdTargets from attrmodel import AttrModel from embeddedlist import EmbeddedList @@ -92,7 +92,7 @@ class AttrEmbedList(EmbeddedList): self.get_editor()( self.dbstate, self.uistate, self.track, attr, pname, self.get_user_values(), self.add_callback) - except Errors.WindowActiveError: + except WindowActiveError: pass def add_callback(self, name): @@ -110,7 +110,7 @@ class AttrEmbedList(EmbeddedList): self.get_editor()( self.dbstate, self.uistate, self.track, attr, pname, self.get_user_values(), self.edit_callback) - except Errors.WindowActiveError: + except WindowActiveError: pass def edit_callback(self, name): diff --git a/src/gui/editors/displaytabs/backreflist.py b/src/gui/editors/displaytabs/backreflist.py index bb2fd95c0..479d2b36c 100644 --- a/src/gui/editors/displaytabs/backreflist.py +++ b/src/gui/editors/displaytabs/backreflist.py @@ -41,7 +41,7 @@ import gtk # GRAMPS classes # #------------------------------------------------------------------------- -import Errors +from gen.errors import WindowActiveError from gui.widgets import SimpleButton from embeddedlist import EmbeddedList @@ -144,47 +144,47 @@ class BackRefList(EmbeddedList): try: person = self.dbstate.db.get_person_from_handle(ref) EditPerson(self.dbstate, self.uistate, [], person) - except Errors.WindowActiveError: + except WindowActiveError: pass elif reftype == 'Family': try: family = self.dbstate.db.get_family_from_handle(ref) EditFamily(self.dbstate, self.uistate, [], family) - except Errors.WindowActiveError: + except WindowActiveError: pass elif reftype == 'Source': try: source = self.dbstate.db.get_source_from_handle(ref) EditSource(self.dbstate, self.uistate, [], source) - except Errors.WindowActiveError: + except WindowActiveError: pass elif reftype == 'Citation': try: citation = self.dbstate.db.get_citation_from_handle(ref) EditCitation(self.dbstate, self.uistate, [], citation) - except Errors.WindowActiveError: + except WindowActiveError: pass elif reftype == 'Place': try: place = self.dbstate.db.get_place_from_handle(ref) EditPlace(self.dbstate, self.uistate, [], place) - except Errors.WindowActiveError: + except WindowActiveError: pass elif reftype == 'MediaObject': try: obj = self.dbstate.db.get_object_from_handle(ref) EditMedia(self.dbstate, self.uistate, [], obj) - except Errors.WindowActiveError: + except WindowActiveError: pass elif reftype == 'Event': try: event = self.dbstate.db.get_event_from_handle(ref) EditEvent(self.dbstate, self.uistate, [], event) - except Errors.WindowActiveError: + except WindowActiveError: pass elif reftype == 'Repository': try: repo = self.dbstate.db.get_repository_from_handle(ref) EditRepository(self.dbstate, self.uistate, [], repo) - except Errors.WindowActiveError: + except WindowActiveError: pass diff --git a/src/gui/editors/displaytabs/buttontab.py b/src/gui/editors/displaytabs/buttontab.py index eef809efd..89c9e70da 100644 --- a/src/gui/editors/displaytabs/buttontab.py +++ b/src/gui/editors/displaytabs/buttontab.py @@ -42,7 +42,7 @@ import gtk #------------------------------------------------------------------------- from gui.widgets import SimpleButton from grampstab import GrampsTab -import Errors +from gen.errors import WindowActiveError _KP_ENTER = gtk.gdk.keyval_from_name("KP_Enter") _RETURN = gtk.gdk.keyval_from_name("Return") @@ -196,7 +196,7 @@ class ButtonTab(GrampsTab): if event.type == gtk.gdk._2BUTTON_PRESS and event.button == 1: try: self.edit_button_clicked(obj) - except Errors.WindowActiveError: + except WindowActiveError: pass def key_pressed(self, obj, event): @@ -209,7 +209,7 @@ class ButtonTab(GrampsTab): if event.keyval in (_RETURN, _KP_ENTER): try: self.edit_button_clicked(obj) - except Errors.WindowActiveError: + except WindowActiveError: pass elif event.keyval in (_DEL,) and self.del_btn: if self.dirty_selection or self.dbstate.db.readonly: diff --git a/src/gui/editors/displaytabs/citationembedlist.py b/src/gui/editors/displaytabs/citationembedlist.py index f02fb08a8..565e5b0e5 100644 --- a/src/gui/editors/displaytabs/citationembedlist.py +++ b/src/gui/editors/displaytabs/citationembedlist.py @@ -42,7 +42,7 @@ import gobject # GRAMPS classes # #------------------------------------------------------------------------- -import Errors +from gen.errors import WindowActiveError import gen.lib from gen.lib import Source, Citation from gui.dbguielement import DbGUIElement @@ -130,7 +130,7 @@ class CitationEmbedList(EmbeddedList, DbGUIElement): the new citation. Called when the Add button is clicked. - If the window already exists (Errors.WindowActiveError), we ignore it. + If the window already exists (WindowActiveError), we ignore it. This prevents the dialog from coming up twice on the same object. """ try: @@ -138,7 +138,7 @@ class CitationEmbedList(EmbeddedList, DbGUIElement): EditCitation(self.dbstate, self.uistate, self.track, gen.lib.Citation(), gen.lib.Source(), self.add_callback, self.callertitle) - except Errors.WindowActiveError: + except WindowActiveError: pass def add_callback(self, value): @@ -167,7 +167,7 @@ class CitationEmbedList(EmbeddedList, DbGUIElement): gen.lib.Citation(), object, callback=self.add_callback, callertitle=self.callertitle) - except Errors.WindowActiveError: + except WindowActiveError: from gui.dialog import WarningDialog WarningDialog(_("Cannot share this reference"), self.__blocked_text()) @@ -177,7 +177,7 @@ class CitationEmbedList(EmbeddedList, DbGUIElement): EditCitation(self.dbstate, self.uistate, self.track, object, callback=self.add_callback, callertitle=self.callertitle) - except Errors.WindowActiveError: + except WindowActiveError: from gui.dialog import WarningDialog WarningDialog(_("Cannot share this reference"), self.__blocked_text()) @@ -200,7 +200,7 @@ class CitationEmbedList(EmbeddedList, DbGUIElement): with the citation. Called when the Edit button is clicked. - If the window already exists (Errors.WindowActiveError), we ignore it. + If the window already exists (WindowActiveError), we ignore it. This prevents the dialog from coming up twice on the same object. """ handle = self.get_selected() @@ -210,7 +210,7 @@ class CitationEmbedList(EmbeddedList, DbGUIElement): from gui.editors import EditCitation EditCitation(self.dbstate, self.uistate, self.track, citation, callertitle = self.callertitle) - except Errors.WindowActiveError: + except WindowActiveError: pass def citation_delete(self, del_citation_handle_list): @@ -250,7 +250,7 @@ class CitationEmbedList(EmbeddedList, DbGUIElement): EditCitation(self.dbstate, self.uistate, self.track, object, callback=self.add_callback, callertitle=self.callertitle) - except Errors.WindowActiveError: + except WindowActiveError: from gui.dialog import WarningDialog WarningDialog(_("Cannot share this reference"), self.__blocked_text()) @@ -270,7 +270,7 @@ class CitationEmbedList(EmbeddedList, DbGUIElement): gen.lib.Citation(), object, callback=self.add_callback, callertitle=self.callertitle) - except Errors.WindowActiveError: + except WindowActiveError: from gui.dialog import WarningDialog WarningDialog(_("Cannot share this reference"), self.__blocked_text()) diff --git a/src/gui/editors/displaytabs/eventembedlist.py b/src/gui/editors/displaytabs/eventembedlist.py index 3ef3a6df2..9df08387f 100644 --- a/src/gui/editors/displaytabs/eventembedlist.py +++ b/src/gui/editors/displaytabs/eventembedlist.py @@ -36,7 +36,7 @@ import gobject # #------------------------------------------------------------------------- import gen.lib -import Errors +from gen.errors import WindowActiveError from gui.ddtargets import DdTargets from groupembeddedlist import GroupEmbeddedList from eventrefmodel import EventRefModel @@ -230,7 +230,7 @@ class EventEmbedList(DbGUIElement, GroupEmbeddedList): self.get_ref_editor()( self.dbstate, self.uistate, self.track, event, ref, self.object_added) - except Errors.WindowActiveError: + except WindowActiveError: pass def __blocked_text(self): @@ -255,7 +255,7 @@ class EventEmbedList(DbGUIElement, GroupEmbeddedList): self.get_ref_editor()( self.dbstate, self.uistate, self.track, event, ref, self.object_added) - except Errors.WindowActiveError: + except WindowActiveError: from gui.dialog import WarningDialog WarningDialog(_("Cannot share this reference"), self.__blocked_text()) @@ -268,7 +268,7 @@ class EventEmbedList(DbGUIElement, GroupEmbeddedList): self.get_ref_editor()( self.dbstate, self.uistate, self.track, event, ref[1], self.object_edited) - except Errors.WindowActiveError: + except WindowActiveError: from gui.dialog import WarningDialog WarningDialog(_("Cannot edit this reference"), self.__blocked_text()) @@ -332,7 +332,7 @@ class EventEmbedList(DbGUIElement, GroupEmbeddedList): try: self.get_ref_editor()(self.dbstate, self.uistate, self.track, event, obj, self.object_edited) - except Errors.WindowActiveError: + except WindowActiveError: from gui.dialog import WarningDialog WarningDialog( _("Cannot edit this reference"), @@ -353,7 +353,7 @@ class EventEmbedList(DbGUIElement, GroupEmbeddedList): self.get_ref_editor()( self.dbstate, self.uistate, self.track, event, ref, self.object_added) - except Errors.WindowActiveError: + except WindowActiveError: pass def editnotworkgroup(self, key): @@ -364,7 +364,7 @@ class EventEmbedList(DbGUIElement, GroupEmbeddedList): try: from gui.editors import EditPerson EditPerson(self.dbstate, self.uistate, [], person) - except Errors.WindowActiveError: + except WindowActiveError: pass def dropnotworkgroup(self, row, obj): diff --git a/src/gui/editors/displaytabs/gallerytab.py b/src/gui/editors/displaytabs/gallerytab.py index e2ffa94ba..de91407aa 100644 --- a/src/gui/editors/displaytabs/gallerytab.py +++ b/src/gui/editors/displaytabs/gallerytab.py @@ -54,7 +54,7 @@ import gen.lib from gen.db import DbTxn import Utils from gui.thumbnails import get_thumbnail_image -import Errors +from gen.errors import WindowActiveError import gen.mime from gui.ddtargets import DdTargets from buttontab import ButtonTab @@ -274,7 +274,7 @@ class GalleryTab(ButtonTab, DbGUIElement): EditMediaRef(self.dbstate, self.uistate, self.track, gen.lib.MediaObject(), gen.lib.MediaRef(), self.add_callback) - except Errors.WindowActiveError: + except WindowActiveError: pass def add_callback(self, media_ref, media): @@ -319,7 +319,7 @@ class GalleryTab(ButtonTab, DbGUIElement): from gui.editors import EditMediaRef EditMediaRef(self.dbstate, self.uistate, self.track, src, sref, self.add_callback) - except Errors.WindowActiveError: + except WindowActiveError: from gui.dialog import WarningDialog WarningDialog(_("Cannot share this reference"), self.__blocked_text()) @@ -339,7 +339,7 @@ class GalleryTab(ButtonTab, DbGUIElement): from gui.editors import EditMediaRef EditMediaRef(self.dbstate, self.uistate, self.track, obj, ref, self.edit_callback) - except Errors.WindowActiveError: + except WindowActiveError: from gui.dialog import WarningDialog WarningDialog(_("Cannot edit this reference"), self.__blocked_text()) diff --git a/src/gui/editors/displaytabs/ldsembedlist.py b/src/gui/editors/displaytabs/ldsembedlist.py index b3cb96d12..34d648495 100644 --- a/src/gui/editors/displaytabs/ldsembedlist.py +++ b/src/gui/editors/displaytabs/ldsembedlist.py @@ -34,7 +34,7 @@ import gobject # #------------------------------------------------------------------------- import gen.lib -import Errors +from gen.errors import WindowActiveError from ldsmodel import LdsModel from embeddedlist import EmbeddedList @@ -88,7 +88,7 @@ class LdsEmbedList(EmbeddedList): try: self.get_editor()(self.dbstate, self.uistate, self.track, self.new_data(), self.add_callback) - except Errors.WindowActiveError: + except WindowActiveError: pass def add_callback(self, name): @@ -103,7 +103,7 @@ class LdsEmbedList(EmbeddedList): try: self.get_editor()(self.dbstate, self.uistate, self.track, lds, self.edit_callback) - except Errors.WindowActiveError: + except WindowActiveError: pass def edit_callback(self, name): diff --git a/src/gui/editors/displaytabs/locationembedlist.py b/src/gui/editors/displaytabs/locationembedlist.py index 672b92319..77e18fc73 100644 --- a/src/gui/editors/displaytabs/locationembedlist.py +++ b/src/gui/editors/displaytabs/locationembedlist.py @@ -34,7 +34,7 @@ import gobject # #------------------------------------------------------------------------- import gen.lib -import Errors +from gen.errors import WindowActiveError from gui.ddtargets import DdTargets from locationmodel import LocationModel from embeddedlist import EmbeddedList @@ -78,7 +78,7 @@ class LocationEmbedList(EmbeddedList): from gui.editors import EditLocation EditLocation(self.dbstate, self.uistate, self.track, loc, self.add_callback) - except Errors.WindowActiveError: + except WindowActiveError: pass def add_callback(self, name): @@ -94,7 +94,7 @@ class LocationEmbedList(EmbeddedList): from gui.editors import EditLocation EditLocation(self.dbstate, self.uistate, self.track, loc, self.edit_callback) - except Errors.WindowActiveError: + except WindowActiveError: pass def edit_callback(self, name): diff --git a/src/gui/editors/displaytabs/nameembedlist.py b/src/gui/editors/displaytabs/nameembedlist.py index 140689a4f..1aef75a31 100644 --- a/src/gui/editors/displaytabs/nameembedlist.py +++ b/src/gui/editors/displaytabs/nameembedlist.py @@ -42,7 +42,7 @@ from gen.ggettext import gettext as _ # #------------------------------------------------------------------------- import gen.lib -import Errors +from gen.errors import WindowActiveError from gui.ddtargets import DdTargets from namemodel import NameModel from groupembeddedlist import GroupEmbeddedList @@ -160,7 +160,7 @@ class NameEmbedList(GroupEmbeddedList): from gui.editors import EditName EditName(self.dbstate, self.uistate, self.track, name, self.add_callback) - except Errors.WindowActiveError: + except WindowActiveError: pass def add_callback(self, name): @@ -181,7 +181,7 @@ class NameEmbedList(GroupEmbeddedList): elif name[0] == NameModel.DEFINDEX: EditName(self.dbstate, self.uistate, self.track, name[1], self.editdef_callback) - except Errors.WindowActiveError: + except WindowActiveError: pass def edit_callback(self, name): diff --git a/src/gui/editors/displaytabs/notetab.py b/src/gui/editors/displaytabs/notetab.py index 3fe3102bb..7b8386e5a 100644 --- a/src/gui/editors/displaytabs/notetab.py +++ b/src/gui/editors/displaytabs/notetab.py @@ -39,7 +39,7 @@ import gobject # GRAMPS classes # #------------------------------------------------------------------------- -import Errors +from gen.errors import WindowActiveError import gen.lib from gui.dbguielement import DbGUIElement from gui.selectors import SelectorFactory @@ -124,7 +124,7 @@ class NoteTab(EmbeddedList, DbGUIElement): note. Called when the Add button is clicked. - If the window already exists (Errors.WindowActiveError), we ignore it. + If the window already exists (WindowActiveError), we ignore it. This prevents the dialog from coming up twice on the same object. """ note = gen.lib.Note() @@ -135,7 +135,7 @@ class NoteTab(EmbeddedList, DbGUIElement): EditNote(self.dbstate, self.uistate, self.track, note, self.add_callback, self.callertitle, extratype = [self.notetype]) - except Errors.WindowActiveError: + except WindowActiveError: pass def add_callback(self, name): @@ -155,7 +155,7 @@ class NoteTab(EmbeddedList, DbGUIElement): note. Called when the Edit button is clicked. - If the window already exists (Errors.WindowActiveError), we ignore it. + If the window already exists (WindowActiveError), we ignore it. This prevents the dialog from coming up twice on the same object. """ handle = self.get_selected() @@ -166,7 +166,7 @@ class NoteTab(EmbeddedList, DbGUIElement): EditNote(self.dbstate, self.uistate, self.track, note, callertitle = self.callertitle, extratype = [self.notetype] ) - except Errors.WindowActiveError: + except WindowActiveError: pass def share_button_clicked(self, obj): diff --git a/src/gui/editors/displaytabs/personeventembedlist.py b/src/gui/editors/displaytabs/personeventembedlist.py index 9c88ef99f..00a29d72b 100644 --- a/src/gui/editors/displaytabs/personeventembedlist.py +++ b/src/gui/editors/displaytabs/personeventembedlist.py @@ -38,7 +38,7 @@ import gen.lib from gen.display.name import displayer as name_displayer from eventembedlist import EventEmbedList from eventrefmodel import EventRefModel -import Errors +from gen.errors import WindowActiveError #------------------------------------------------------------------------- # @@ -117,7 +117,7 @@ class PersonEventEmbedList(EventEmbedList): try: from gui.editors import EditFamily EditFamily(self.dbstate, self.uistate, [], family) - except Errors.WindowActiveError: + except WindowActiveError: pass def _non_native_change(self): diff --git a/src/gui/editors/displaytabs/personrefembedlist.py b/src/gui/editors/displaytabs/personrefembedlist.py index 059fcd389..649d4e751 100644 --- a/src/gui/editors/displaytabs/personrefembedlist.py +++ b/src/gui/editors/displaytabs/personrefembedlist.py @@ -34,7 +34,7 @@ import gobject # #------------------------------------------------------------------------- import gen.lib -import Errors +from gen.errors import WindowActiveError from gui.ddtargets import DdTargets from personrefmodel import PersonRefModel from embeddedlist import EmbeddedList @@ -89,7 +89,7 @@ class PersonRefEmbedList(EmbeddedList): EditPersonRef( self.dbstate, self.uistate, self.track, ref, self.add_callback) - except Errors.WindowActiveError: + except WindowActiveError: pass def add_callback(self, obj): @@ -106,7 +106,7 @@ class PersonRefEmbedList(EmbeddedList): EditPersonRef( self.dbstate, self.uistate, self.track, ref, self.edit_callback) - except Errors.WindowActiveError: + except WindowActiveError: pass def edit_callback(self, obj): @@ -124,5 +124,5 @@ class PersonRefEmbedList(EmbeddedList): EditPersonRef( self.dbstate, self.uistate, self.track, ref, self.add_callback) - except Errors.WindowActiveError: + except WindowActiveError: pass diff --git a/src/gui/editors/displaytabs/repoembedlist.py b/src/gui/editors/displaytabs/repoembedlist.py index a3d4f085c..e32d13f5b 100644 --- a/src/gui/editors/displaytabs/repoembedlist.py +++ b/src/gui/editors/displaytabs/repoembedlist.py @@ -36,7 +36,7 @@ import gobject import gen.lib from gui.dbguielement import DbGUIElement from gui.selectors import SelectorFactory -import Errors +from gen.errors import WindowActiveError from gui.ddtargets import DdTargets from reporefmodel import RepoRefModel from embeddedlist import EmbeddedList @@ -107,7 +107,7 @@ class RepoEmbedList(EmbeddedList, DbGUIElement): EditRepoRef( self.dbstate, self.uistate, self.track, repo, ref, self.add_callback) - except Errors.WindowActiveError: + except WindowActiveError: pass def add_button_clicked(self, obj): @@ -118,7 +118,7 @@ class RepoEmbedList(EmbeddedList, DbGUIElement): EditRepoRef( self.dbstate, self.uistate, self.track, repo, ref, self.add_callback) - except Errors.WindowActiveError: + except WindowActiveError: pass def share_button_clicked(self, obj): @@ -141,7 +141,7 @@ class RepoEmbedList(EmbeddedList, DbGUIElement): ref, self.add_callback) - except Errors.WindowActiveError: + except WindowActiveError: pass def add_callback(self, value): @@ -162,7 +162,7 @@ class RepoEmbedList(EmbeddedList, DbGUIElement): EditRepoRef( self.dbstate, self.uistate, self.track, repo, ref, self.edit_callback) - except Errors.WindowActiveError: + except WindowActiveError: from gui.dialog import WarningDialog WarningDialog( _("Cannot edit this reference"), diff --git a/src/gui/editors/displaytabs/webembedlist.py b/src/gui/editors/displaytabs/webembedlist.py index 21a34e25d..998a1457d 100644 --- a/src/gui/editors/displaytabs/webembedlist.py +++ b/src/gui/editors/displaytabs/webembedlist.py @@ -35,7 +35,7 @@ import gobject # #------------------------------------------------------------------------- import gen.lib -import Errors +from gen.errors import WindowActiveError from gui.ddtargets import DdTargets from webmodel import WebModel from embeddedlist import EmbeddedList @@ -87,7 +87,7 @@ class WebEmbedList(EmbeddedList): try: EditUrl(self.dbstate, self.uistate, self.track, '', url, self.add_callback) - except Errors.WindowActiveError: + except WindowActiveError: pass def add_callback(self, url): @@ -103,7 +103,7 @@ class WebEmbedList(EmbeddedList): try: EditUrl(self.dbstate, self.uistate, self.track, '', url, self.edit_callback) - except Errors.WindowActiveError: + except WindowActiveError: pass def edit_callback(self, url): diff --git a/src/gui/editors/editchildref.py b/src/gui/editors/editchildref.py index 9c533fcef..29c10746d 100644 --- a/src/gui/editors/editchildref.py +++ b/src/gui/editors/editchildref.py @@ -48,7 +48,7 @@ import gtk #------------------------------------------------------------------------- from editsecondary import EditSecondary from gen.lib import NoteType -import Errors +from gen.errors import WindowActiveError from gui.glade import Glade from displaytabs import CitationEmbedList, NoteTab from gui.widgets import MonitoredDataType, PrivacyButton @@ -176,7 +176,7 @@ class EditChildRef(EditSecondary): person = self.db.get_person_from_handle(handle) EditPerson(self.dbstate, self.uistate, self.track, person) - except Errors.WindowActiveError: + except WindowActiveError: pass def person_change(self, handles): diff --git a/src/gui/editors/editfamily.py b/src/gui/editors/editfamily.py index d45c2f48d..336c51e29 100644 --- a/src/gui/editors/editfamily.py +++ b/src/gui/editors/editfamily.py @@ -66,7 +66,7 @@ from gen.display.name import displayer as name_displayer from gen.utils import get_marriage_or_fallback import gen.lib from gen.db import DbTxn -import Errors +from gen.errors import WindowActiveError import gen.datehandler from gui.glade import Glade @@ -242,7 +242,7 @@ class ChildEmbedList(EmbeddedList): try: EditChildRef(n, self.dbstate, self.uistate, self.track, ref, self.child_ref_edited) - except Errors.WindowActiveError: + except WindowActiveError: pass def edit_child_button_clicked(self, obj=None): @@ -252,7 +252,7 @@ class ChildEmbedList(EmbeddedList): try: EditPerson(self.dbstate, self.uistate, self.track, p, self.child_ref_edited) - except Errors.WindowActiveError: + except WindowActiveError: pass def north_american(self): @@ -841,7 +841,7 @@ class EditFamily(EditPrimary): person = self.db.get_person_from_handle(handle) EditPerson(self.dbstate, self.uistate, self.track, person) - except Errors.WindowActiveError: + except WindowActiveError: pass def load_parent(self, handle, name_obj, birth_obj, birth_label, death_obj, diff --git a/src/gui/editors/editname.py b/src/gui/editors/editname.py index cf52ef2bf..0db135487 100644 --- a/src/gui/editors/editname.py +++ b/src/gui/editors/editname.py @@ -53,7 +53,7 @@ from displaytabs import GrampsTab, CitationEmbedList, NoteTab, SurnameTab from gui.widgets import (MonitoredEntry, MonitoredMenu, MonitoredDate, MonitoredDataType, PrivacyButton) from gui.glade import Glade -from Errors import ValidationError +from gen.errors import ValidationError #------------------------------------------------------------------------- # diff --git a/src/gui/editors/editperson.py b/src/gui/editors/editperson.py index 9f76cf924..f5cc30f04 100644 --- a/src/gui/editors/editperson.py +++ b/src/gui/editors/editperson.py @@ -57,7 +57,7 @@ import gen.lib from gen.db import DbTxn from gui import widgets from gen.display.name import displayer as name_displayer -import Errors +from gen.errors import WindowActiveError from gui.glade import Glade from editprimary import EditPrimary @@ -65,7 +65,7 @@ from editmediaref import EditMediaRef from editname import EditName import config from gui.dialog import ErrorDialog, ICON -from Errors import ValidationError +from gen.errors import ValidationError from displaytabs import (PersonEventEmbedList, NameEmbedList, CitationEmbedList, AttrEmbedList, AddrEmbedList, NoteTab, GalleryTab, @@ -600,7 +600,7 @@ class EditPerson(EditPrimary): try: EditMediaRef(self.dbstate, self.uistate, self.track, media_obj, media_ref, self.load_photo) - except Errors.WindowActiveError: + except WindowActiveError: pass elif gui.utils.is_right_click(event): @@ -857,7 +857,7 @@ class EditPerson(EditPrimary): try: EditName(self.dbstate, self.uistate, self.track, self.pname, self._update_name) - except Errors.WindowActiveError: + except WindowActiveError: pass def _mult_surn_clicked(self, obj): diff --git a/src/gui/editors/editplace.py b/src/gui/editors/editplace.py index dcd0a7ca9..787e85a1d 100644 --- a/src/gui/editors/editplace.py +++ b/src/gui/editors/editplace.py @@ -50,7 +50,7 @@ from editprimary import EditPrimary from displaytabs import (GrampsTab, LocationEmbedList, CitationEmbedList, GalleryTab, NoteTab, WebEmbedList, PlaceBackRefList) from gui.widgets import MonitoredEntry, PrivacyButton -from Errors import ValidationError +from gen.errors import ValidationError from PlaceUtils import conv_lat_lon from gui.dialog import ErrorDialog from gui.glade import Glade diff --git a/src/gui/editors/objectentries.py b/src/gui/editors/objectentries.py index 8e4470745..8d28964a4 100644 --- a/src/gui/editors/objectentries.py +++ b/src/gui/editors/objectentries.py @@ -50,7 +50,7 @@ from editmedia import EditMedia from editnote import EditNote from gui.selectors import SelectorFactory from gui.ddtargets import DdTargets -from Errors import WindowActiveError +from gen.errors import WindowActiveError #------------------------------------------------------------------------- # diff --git a/src/gui/filtereditor.py b/src/gui/filtereditor.py index 16c1461f4..84a64e997 100644 --- a/src/gui/filtereditor.py +++ b/src/gui/filtereditor.py @@ -61,7 +61,7 @@ from gui.managedwindow import ManagedWindow from gui.dialog import QuestionDialog import const from gui.display import display_help -import Errors +from gen.errors import WindowActiveError from gen.ggettext import sgettext as _ import gen.lib from gen.filters import rules @@ -839,7 +839,7 @@ class EditFilter(ManagedWindow): EditRule(self.namespace, self.dbstate, self.uistate, self.track, self.filterdb, None, _('Add Rule'), self.update_rule, self.filter.get_name()) - except Errors.WindowActiveError: + except WindowActiveError: pass def on_edit_clicked(self, obj): @@ -851,7 +851,7 @@ class EditFilter(ManagedWindow): EditRule(self.namespace, self.dbstate, self.uistate, self.track, self.filterdb, d, _('Edit Rule'), self.update_rule, self.filter.get_name()) - except Errors.WindowActiveError: + except WindowActiveError: pass def update_rule(self, old_rule, new_rule): diff --git a/src/gui/managedwindow.py b/src/gui/managedwindow.py index 02994bc63..5afbc0171 100644 --- a/src/gui/managedwindow.py +++ b/src/gui/managedwindow.py @@ -47,7 +47,7 @@ import gtk # #------------------------------------------------------------------------- import const -import Errors +from gen.errors import WindowActiveError import config from gui.glade import Glade @@ -357,7 +357,7 @@ class ManagedWindow(object): if uistate and uistate.gwm.get_item_from_id(window_key): uistate.gwm.get_item_from_id(window_key).present() - raise Errors.WindowActiveError('This window is already active') + raise WindowActiveError('This window is already active') else: self.window_id = window_key self.submenu_label = submenu_label diff --git a/src/gui/merge/mergefamily.py b/src/gui/merge/mergefamily.py index 8efd48e78..6c468578b 100644 --- a/src/gui/merge/mergefamily.py +++ b/src/gui/merge/mergefamily.py @@ -33,7 +33,7 @@ from gen.ggettext import sgettext as _ from gen.display.name import displayer as name_displayer import const from gui.display import display_help -from Errors import MergeError +from gen.errors import MergeError from gui.dialog import ErrorDialog from gui.managedwindow import ManagedWindow from gen.merge import MergePersonQuery, MergeFamilyQuery diff --git a/src/gui/merge/mergeperson.py b/src/gui/merge/mergeperson.py index f0e7a2d78..0756b7343 100644 --- a/src/gui/merge/mergeperson.py +++ b/src/gui/merge/mergeperson.py @@ -44,7 +44,7 @@ from gen.display.name import displayer as name_displayer import const from gui.display import display_help import gen.datehandler -from Errors import MergeError +from gen.errors import MergeError from gui.dialog import ErrorDialog from gui.managedwindow import ManagedWindow from gen.merge import MergePersonQuery diff --git a/src/gui/plug/_windows.py b/src/gui/plug/_windows.py index 501ee6b66..a26147d36 100644 --- a/src/gui/plug/_windows.py +++ b/src/gui/plug/_windows.py @@ -47,7 +47,7 @@ import gobject # #------------------------------------------------------------------------- from gui.managedwindow import ManagedWindow -import Errors +from gen.errors import UnavailableError, WindowActiveError from gen.plug import PluginRegister, PTYPE_STR, load_addon_file from gen.ggettext import gettext as _ from gui.utils import open_file_with_default_application @@ -469,7 +469,7 @@ class PluginStatus(ManagedWindow): hiddenstr = self.HIDDEN else: hiddenstr = self.AVAILABLE - if err == Errors.UnavailableError: + if err == UnavailableError: self.model.append(row=[ '%s' % _('Unavailable'), i[0], str(i[1][1]), None, pdata.id, hiddenstr]) @@ -810,7 +810,7 @@ class ToolManagedWindowBase(ManagedWindow): if event.type == gtk.gdk._2BUTTON_PRESS: try: EditPerson(self.dbstate, self.uistate, [], person) - except Errors.WindowActiveError: + except WindowActiveError: pass else: self.uistate.set_active(person_handle, 'Person') diff --git a/src/gui/plug/quick/_quicktable.py b/src/gui/plug/quick/_quicktable.py index a5b48b05c..431e60b10 100644 --- a/src/gui/plug/quick/_quicktable.py +++ b/src/gui/plug/quick/_quicktable.py @@ -49,7 +49,7 @@ from gtk.gdk import ACTION_COPY from gen.ggettext import sgettext as _ from gen.simple import SimpleTable from TransUtils import trans_objclass -import Errors +from gen.errors import WindowActiveError from gui.widgets.multitreeview import MultiTreeView from gui.ddtargets import DdTargets from gui.plug.quick import run_quick_report_by_name @@ -185,7 +185,7 @@ class QuickTable(SimpleTable): EditPerson(self.simpledoc.doc.dbstate, self.simpledoc.doc.uistate, [], person) return True # handled event - except Errors.WindowActiveError: + except WindowActiveError: pass elif objclass == 'Event': event = self.access.dbase.get_event_from_handle(handle) @@ -194,7 +194,7 @@ class QuickTable(SimpleTable): EditEvent(self.simpledoc.doc.dbstate, self.simpledoc.doc.uistate, [], event) return True # handled event - except Errors.WindowActiveError: + except WindowActiveError: pass elif objclass == 'Family': ref = self.access.dbase.get_family_from_handle(handle) @@ -203,7 +203,7 @@ class QuickTable(SimpleTable): EditFamily(self.simpledoc.doc.dbstate, self.simpledoc.doc.uistate, [], ref) return True # handled event - except Errors.WindowActiveError: + except WindowActiveError: pass elif objclass == 'Citation': ref = self.access.dbase.get_citation_from_handle(handle) @@ -212,7 +212,7 @@ class QuickTable(SimpleTable): EditCitation(self.simpledoc.doc.dbstate, self.simpledoc.doc.uistate, [], ref) return True # handled event - except Errors.WindowActiveError: + except WindowActiveError: pass elif objclass == 'Source': ref = self.access.dbase.get_source_from_handle(handle) @@ -221,7 +221,7 @@ class QuickTable(SimpleTable): EditSource(self.simpledoc.doc.dbstate, self.simpledoc.doc.uistate, [], ref) return True # handled event - except Errors.WindowActiveError: + except WindowActiveError: pass elif objclass == 'Place': ref = self.access.dbase.get_place_from_handle(handle) @@ -230,7 +230,7 @@ class QuickTable(SimpleTable): EditPlace(self.simpledoc.doc.dbstate, self.simpledoc.doc.uistate, [], ref) return True # handled event - except Errors.WindowActiveError: + except WindowActiveError: pass elif objclass == 'Repository': ref = self.access.dbase.get_repository_from_handle(handle) @@ -239,7 +239,7 @@ class QuickTable(SimpleTable): EditRepository(self.simpledoc.doc.dbstate, self.simpledoc.doc.uistate, [], ref) return True # handled event - except Errors.WindowActiveError: + except WindowActiveError: pass elif objclass == 'Note': ref = self.access.dbase.get_note_from_handle(handle) @@ -248,7 +248,7 @@ class QuickTable(SimpleTable): EditNote(self.simpledoc.doc.dbstate, self.simpledoc.doc.uistate, [], ref) return True # handled event - except Errors.WindowActiveError: + except WindowActiveError: pass elif objclass in ['Media', 'MediaObject']: ref = self.access.dbase.get_object_from_handle(handle) @@ -257,7 +257,7 @@ class QuickTable(SimpleTable): EditMedia(self.simpledoc.doc.dbstate, self.simpledoc.doc.uistate, [], ref) return True # handled event - except Errors.WindowActiveError: + except WindowActiveError: pass elif objclass == 'PersonList': run_quick_report_by_name(self.simpledoc.doc.dbstate, diff --git a/src/gui/plug/report/_reportdialog.py b/src/gui/plug/report/_reportdialog.py index 2a9ee7063..aa0448091 100644 --- a/src/gui/plug/report/_reportdialog.py +++ b/src/gui/plug/report/_reportdialog.py @@ -50,7 +50,7 @@ import gtk #------------------------------------------------------------------------- from gen.ggettext import gettext as _ import config -import Errors +from gen.errors import DatabaseError, FilterError, ReportError, WindowActiveError from gui.utils import open_file_with_default_application from gui.plug import add_gui_options from gui.user import User @@ -626,7 +626,7 @@ def report(dbstate, uistate, person, report_class, options_class, elif category in (CATEGORY_BOOK, CATEGORY_CODE): try: report_class(dbstate, uistate) - except Errors.WindowActiveError: + except WindowActiveError: pass return else: @@ -654,15 +654,15 @@ def report(dbstate, uistate, person, report_class, options_class, out_file = dialog.options.get_output() open_file_with_default_application(out_file) - except Errors.FilterError, msg: + except FilterError, msg: (m1, m2) = msg.messages() ErrorDialog(m1, m2) except IOError, msg: ErrorDialog(_("Report could not be created"), str(msg)) - except Errors.ReportError, msg: + except ReportError, msg: (m1, m2) = msg.messages() ErrorDialog(m1, m2) - except Errors.DatabaseError,msg: + except DatabaseError,msg: ErrorDialog(_("Report could not be created"), str(msg)) # The following except statement will catch all "NoneType" exceptions. # This is useful for released code where the exception is most likely diff --git a/src/gui/plug/tool.py b/src/gui/plug/tool.py index b651b317d..ba5999c90 100644 --- a/src/gui/plug/tool.py +++ b/src/gui/plug/tool.py @@ -40,7 +40,7 @@ log = logging.getLogger(".") #------------------------------------------------------------------------- import const from gen.display.name import displayer as name_displayer -import Errors +from gen.errors import WindowActiveError from gen.plug._options import (Options, OptionHandler, OptionList, OptionListCollection) from gen.plug import (TOOL_DEBUG, TOOL_ANAL, TOOL_DBPROC, TOOL_DBFIX, @@ -251,7 +251,7 @@ def gui_tool(dbstate, uistate, tool_class, options_class, translated_name, try: tool_class(dbstate, uistate, options_class, name, callback) - except Errors.WindowActiveError: + except WindowActiveError: pass except: log.error("Failed to start tool.", exc_info=True) diff --git a/src/gui/utils.py b/src/gui/utils.py index 61776d166..9ae6e3462 100644 --- a/src/gui/utils.py +++ b/src/gui/utils.py @@ -49,7 +49,6 @@ import constfunc # #------------------------------------------------------------------------- import gen.lib -import Errors import constfunc #------------------------------------------------------------------------- diff --git a/src/gui/viewmanager.py b/src/gui/viewmanager.py index 1229390b2..d62f7706b 100644 --- a/src/gui/viewmanager.py +++ b/src/gui/viewmanager.py @@ -81,7 +81,7 @@ from gui.displaystate import DisplayState, RecentDocsMenu import const import constfunc import config -import Errors +from gen.errors import WindowActiveError from gui.dialog import (ErrorDialog, WarningDialog, QuestionDialog2, InfoDialog) from gui import widgets @@ -1105,7 +1105,7 @@ class ViewManager(CLIManager): """ try: GrampsPreferences(self.uistate, self.dbstate) - except Errors.WindowActiveError: + except WindowActiveError: return def tip_of_day_activate(self, obj): @@ -1121,7 +1121,7 @@ class ViewManager(CLIManager): """ try: PluginWindows.PluginStatus(self.dbstate, self.uistate, []) - except Errors.WindowActiveError: + except WindowActiveError: pass def navigator_toggle(self, obj): @@ -1649,7 +1649,7 @@ class ViewManager(CLIManager): """ try: ReportPluginDialog(self.dbstate, self.uistate, []) - except Errors.WindowActiveError: + except WindowActiveError: return def tools_clicked(self, obj): @@ -1658,7 +1658,7 @@ class ViewManager(CLIManager): """ try: ToolPluginDialog(self.dbstate, self.uistate, []) - except Errors.WindowActiveError: + except WindowActiveError: return def clipboard(self, obj): @@ -1668,7 +1668,7 @@ class ViewManager(CLIManager): from gui.clipboard import ClipboardWindow try: ClipboardWindow(self.dbstate, self.uistate) - except Errors.WindowActiveError: + except WindowActiveError: return def config_view(self, obj): @@ -1699,7 +1699,7 @@ class ViewManager(CLIManager): """ try: self.undo_history_window = UndoHistory(self.dbstate, self.uistate) - except Errors.WindowActiveError: + except WindowActiveError: return def export_data(self, obj): @@ -1710,7 +1710,7 @@ class ViewManager(CLIManager): import ExportAssistant try: ExportAssistant.ExportAssistant(self.dbstate, self.uistate) - except Errors.WindowActiveError: + except WindowActiveError: return def __rebuild_report_and_tool_menus(self): diff --git a/src/gui/views/listview.py b/src/gui/views/listview.py index 9045da83f..3a7aa417f 100644 --- a/src/gui/views/listview.py +++ b/src/gui/views/listview.py @@ -55,7 +55,7 @@ from gui.views.navigationview import NavigationView from gui.columnorder import ColumnOrder import config import TreeTips -import Errors +from gen.errors import WindowActiveError from gui.filters import SearchBar from gui.utils import add_menuitem import const @@ -333,7 +333,7 @@ class ListView(NavigationView): try: FilterEditor(self.FILTER_TYPE , const.CUSTOM_FILTERS, self.dbstate, self.uistate) - except Errors.WindowActiveError: + except WindowActiveError: return def setup_filter(self): diff --git a/src/gui/views/pageview.py b/src/gui/views/pageview.py index 6d5a962be..76bc3c9e5 100644 --- a/src/gui/views/pageview.py +++ b/src/gui/views/pageview.py @@ -46,7 +46,7 @@ from gen.ggettext import gettext as _ # GRAMPS # #---------------------------------------------------------------- -import Errors +from gen.errors import WindowActiveError from gui.dbguielement import DbGUIElement from gui.widgets.menutoolbuttonaction import MenuToolButtonAction from gui.grampsbar import GrampsBar @@ -606,7 +606,7 @@ class PageView(DbGUIElement): ident=_("%(cat)s - %(view)s") % {'cat': self.get_translated_category(), 'view': self.get_title()}) - except Errors.WindowActiveError: + except WindowActiveError: return class ViewConfigureDialog(ConfigureDialog): diff --git a/src/gui/widgets/grampletpane.py b/src/gui/widgets/grampletpane.py index 9ad4d17d1..6528476cf 100644 --- a/src/gui/widgets/grampletpane.py +++ b/src/gui/widgets/grampletpane.py @@ -41,7 +41,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -import Errors +from gen.errors import WindowActiveError import const from gui.editors import EditPerson, EditFamily from gui.managedwindow import ManagedWindow @@ -598,7 +598,7 @@ class GuiGramplet(object): self.uistate, [], person) return True # handled event - except Errors.WindowActiveError: + except WindowActiveError: pass elif event.type == gtk.gdk.BUTTON_PRESS: # single self.uistate.set_active(handle, 'Person') @@ -610,7 +610,7 @@ class GuiGramplet(object): self.uistate, [], person) return True # handled event - except Errors.WindowActiveError: + except WindowActiveError: pass elif link_type == 'Surname': if event.button == 1: # left mouse @@ -659,7 +659,7 @@ class GuiGramplet(object): self.uistate, [], family) return True # handled event - except Errors.WindowActiveError: + except WindowActiveError: pass elif event.type == gtk.gdk.BUTTON_PRESS: # single self.uistate.set_active(handle, 'Family') @@ -671,7 +671,7 @@ class GuiGramplet(object): self.uistate, [], family) return True # handled event - except Errors.WindowActiveError: + except WindowActiveError: pass elif link_type == 'PersonList': if event.button == 1: # left mouse diff --git a/src/gui/widgets/validatedmaskedentry.py b/src/gui/widgets/validatedmaskedentry.py index f2230da07..b5733a814 100644 --- a/src/gui/widgets/validatedmaskedentry.py +++ b/src/gui/widgets/validatedmaskedentry.py @@ -47,7 +47,7 @@ import pango # Gramps modules # #------------------------------------------------------------------------- -from Errors import MaskError, ValidationError, WindowActiveError +from gen.errors import MaskError, ValidationError, WindowActiveError from gui.widgets.undoableentry import UndoableEntry #------------------------------------------------------------------------- diff --git a/src/plugins/BookReport.py b/src/plugins/BookReport.py index 9f80fcee0..d442ab3fa 100644 --- a/src/plugins/BookReport.py +++ b/src/plugins/BookReport.py @@ -70,7 +70,7 @@ import gobject import const import Utils from gui.listmodel import ListModel -import Errors +from gen.errors import FilterError, ReportError from gui.pluginmanager import GuiPluginManager from gen.plug.docgen import StyleSheet, StyleSheetList, PaperStyle from gui.dialog import WarningDialog, ErrorDialog @@ -1395,10 +1395,10 @@ def write_book_item(database, report_class, options, user): All user dialog has already been handled and the output file opened.""" try: return report_class(database, options, user) - except Errors.ReportError, msg: + except ReportError, msg: (m1, m2) = msg.messages() ErrorDialog(m1, m2) - except Errors.FilterError, msg: + except FilterError, msg: (m1, m2) = msg.messages() ErrorDialog(m1, m2) except: diff --git a/src/plugins/docgen/AsciiDoc.py b/src/plugins/docgen/AsciiDoc.py index 3ad7039eb..14201585e 100644 --- a/src/plugins/docgen/AsciiDoc.py +++ b/src/plugins/docgen/AsciiDoc.py @@ -38,7 +38,7 @@ from gen.ggettext import gettext as _ #------------------------------------------------------------------------ from gen.plug.docgen import (BaseDoc, TextDoc, PARA_ALIGN_RIGHT, PARA_ALIGN_CENTER) -import Errors +from gen.errors import ReportError #------------------------------------------------------------------------ # @@ -149,9 +149,9 @@ class AsciiDoc(BaseDoc,TextDoc): self.f = open(self.filename,"w") except IOError,msg: errmsg = "%s\n%s" % (_("Could not create %s") % self.filename, msg) - raise Errors.ReportError(errmsg) + raise ReportError(errmsg) except: - raise Errors.ReportError(_("Could not create %s") % self.filename) + raise ReportError(_("Could not create %s") % self.filename) self.in_cell = 0 self.text = "" diff --git a/src/plugins/docgen/GtkPrint.py b/src/plugins/docgen/GtkPrint.py index 6e789a720..9eff3494d 100644 --- a/src/plugins/docgen/GtkPrint.py +++ b/src/plugins/docgen/GtkPrint.py @@ -44,7 +44,7 @@ from math import radians #------------------------------------------------------------------------ from gen.plug.docgen import PAPER_PORTRAIT import libcairodoc -import Errors +from gen.errors import UnavailableError #import constfunc #------------------------------------------------------------------------ @@ -64,7 +64,7 @@ import cairo try: # the Gramps-Connect server has no DISPLAY import gtk if gtk.pygtk_version < (2, 10, 0): - raise Errors.UnavailableError(_("PyGtk 2.10 or later is required")) + raise UnavailableError(_("PyGtk 2.10 or later is required")) except: pass diff --git a/src/plugins/docgen/LaTeXDoc.py b/src/plugins/docgen/LaTeXDoc.py index 36d16d5a4..8e7cfe77e 100644 --- a/src/plugins/docgen/LaTeXDoc.py +++ b/src/plugins/docgen/LaTeXDoc.py @@ -49,7 +49,6 @@ import re, os, sys from gen.plug.docgen import BaseDoc, TextDoc, PAPER_LANDSCAPE, FONT_SANS_SERIF, URL_PATTERN from gen.plug.docbackend import DocBackend import Image -import Errors import Utils _CLICKABLE = r'''\url{\1}''' diff --git a/src/plugins/docgen/ODFDoc.py b/src/plugins/docgen/ODFDoc.py index 1daeb3625..c4c12be7e 100644 --- a/src/plugins/docgen/ODFDoc.py +++ b/src/plugins/docgen/ODFDoc.py @@ -89,7 +89,7 @@ from libodfbackend import OdfBackend import const from gen.plug.report import utils as ReportUtils import ImgManip -import Errors +from gen.errors import ReportError #------------------------------------------------------------------------- # @@ -1189,9 +1189,9 @@ class ODFDoc(BaseDoc, TextDoc, DrawDoc): zfile = zipfile.ZipFile(self.filename, "w", zipfile.ZIP_DEFLATED) except IOError, msg: errmsg = "%s\n%s" % (_("Could not create %s") % self.filename, msg) - raise Errors.ReportError(errmsg) + raise ReportError(errmsg) except: - raise Errors.ReportError(_("Could not create %s") % self.filename) + raise ReportError(_("Could not create %s") % self.filename) t = time.localtime(time.time())[:6] @@ -1217,7 +1217,7 @@ class ODFDoc(BaseDoc, TextDoc, DrawDoc): except: errmsg = "%s\n%s" % (_("Could not open %s") % image[0], msg) - raise Errors.ReportError(errmsg) + raise ReportError(errmsg) zfile.close() def _write_styles_file(self): diff --git a/src/plugins/docgen/PSDrawDoc.py b/src/plugins/docgen/PSDrawDoc.py index 06308bddb..467d91a3a 100644 --- a/src/plugins/docgen/PSDrawDoc.py +++ b/src/plugins/docgen/PSDrawDoc.py @@ -40,7 +40,7 @@ from gen.ggettext import gettext as _ from gen.plug.report import utils as ReportUtils from gen.plug.docgen import BaseDoc, DrawDoc, FONT_SERIF, PAPER_PORTRAIT, SOLID from gen.plug.utils import gformat -import Errors +from gen.errors import ReportError def lrgb(grp): grp = ReportUtils.rgb_color(grp) @@ -105,9 +105,9 @@ class PSDrawDoc(BaseDoc, DrawDoc): self.file = open(self.filename,"w") except IOError,msg: errmsg = "%s\n%s" % (_("Could not create %s") % self.filename, msg) - raise Errors.ReportError(errmsg) + raise ReportError(errmsg) except: - raise Errors.ReportError(_("Could not create %s") % self.filename) + raise ReportError(_("Could not create %s") % self.filename) self.file.write( '%!PS-Adobe-3.0\n' diff --git a/src/plugins/docgen/PdfDoc.py b/src/plugins/docgen/PdfDoc.py index 8db4b3ea8..e328cb2e0 100644 --- a/src/plugins/docgen/PdfDoc.py +++ b/src/plugins/docgen/PdfDoc.py @@ -39,7 +39,7 @@ import sys #------------------------------------------------------------------------ import libcairodoc from gen.plug.docgen import INDEX_TYPE_ALP, INDEX_TYPE_TOC -import Errors +from gen.errors import ReportError #------------------------------------------------------------------------ # @@ -92,9 +92,9 @@ class PdfDoc(libcairodoc.CairoDoc): surface = cairo.PDFSurface(filename, paper_width, paper_height) except IOError,msg: errmsg = "%s\n%s" % (_("Could not create %s") % filename, msg) - raise Errors.ReportError(errmsg) + raise ReportError(errmsg) except: - raise Errors.ReportError(_("Could not create %s") % filename) + raise ReportError(_("Could not create %s") % filename) surface.set_fallback_resolution(300, 300) cr = pangocairo.CairoContext(cairo.Context(surface)) diff --git a/src/plugins/docgen/RTFDoc.py b/src/plugins/docgen/RTFDoc.py index cb8d07bbf..729395834 100644 --- a/src/plugins/docgen/RTFDoc.py +++ b/src/plugins/docgen/RTFDoc.py @@ -42,7 +42,7 @@ from gen.plug.docgen import (BaseDoc, TextDoc, FONT_SERIF, PARA_ALIGN_RIGHT, PARA_ALIGN_CENTER, PARA_ALIGN_JUSTIFY, URL_PATTERN) import ImgManip -import Errors +from gen.errors import ReportError import Utils #------------------------------------------------------------------------ @@ -91,9 +91,9 @@ class RTFDoc(BaseDoc,TextDoc): self.f = open(self.filename,"w") except IOError,msg: errmsg = "%s\n%s" % (_("Could not create %s") % self.filename, msg) - raise Errors.ReportError(errmsg) + raise ReportError(errmsg) except: - raise Errors.ReportError(_("Could not create %s") % self.filename) + raise ReportError(_("Could not create %s") % self.filename) style_sheet = self.get_style_sheet() diff --git a/src/plugins/docgen/SvgDrawDoc.py b/src/plugins/docgen/SvgDrawDoc.py index a56e82444..2ae030892 100644 --- a/src/plugins/docgen/SvgDrawDoc.py +++ b/src/plugins/docgen/SvgDrawDoc.py @@ -40,7 +40,7 @@ import StringIO # #------------------------------------------------------------------------- from gen.plug.docgen import BaseDoc, DrawDoc, SOLID, FONT_SANS_SERIF -import Errors +from gen.errors import ReportError #------------------------------------------------------------------------- # @@ -76,9 +76,9 @@ class SvgDrawDoc(BaseDoc, DrawDoc): try: self.f = open(name,"w") except IOError,msg: - raise Errors.ReportError(_("Could not create %s") % name, msg) + raise ReportError(_("Could not create %s") % name, msg) except: - raise Errors.ReportError(_("Could not create %s") % name) + raise ReportError(_("Could not create %s") % name) self.t = StringIO.StringIO() diff --git a/src/plugins/drawreport/AncestorTree.py b/src/plugins/drawreport/AncestorTree.py index 82632aeb0..83a5f8993 100644 --- a/src/plugins/drawreport/AncestorTree.py +++ b/src/plugins/drawreport/AncestorTree.py @@ -46,7 +46,7 @@ from gen.ggettext import sgettext as _ # #------------------------------------------------------------------------ -#from Errors import ReportError +#from gen.errors import ReportError from gen.plug.menu import BooleanOption from gen.plug.menu import NumberOption diff --git a/src/plugins/drawreport/Calendar.py b/src/plugins/drawreport/Calendar.py index f675be09a..60678de2e 100644 --- a/src/plugins/drawreport/Calendar.py +++ b/src/plugins/drawreport/Calendar.py @@ -37,7 +37,7 @@ import time # #------------------------------------------------------------------------ from gen.display.name import displayer as _nd -from Errors import ReportError +from gen.errors import ReportError import Relationship from gen.plug.docgen import (FontStyle, ParagraphStyle, GraphicsStyle, FONT_SERIF, PARA_ALIGN_CENTER, diff --git a/src/plugins/drawreport/DescendTree.py b/src/plugins/drawreport/DescendTree.py index a5627922b..64beb6fdb 100644 --- a/src/plugins/drawreport/DescendTree.py +++ b/src/plugins/drawreport/DescendTree.py @@ -35,7 +35,7 @@ Reports/Graphical Reports/Personal Tree #------------------------------------------------------------------------ from gen.ggettext import sgettext as _ -from Errors import ReportError +from gen.errors import ReportError from gen.plug.menu import TextOption from gen.plug.menu import NumberOption diff --git a/src/plugins/drawreport/FanChart.py b/src/plugins/drawreport/FanChart.py index c1aa2f98d..68d1088df 100644 --- a/src/plugins/drawreport/FanChart.py +++ b/src/plugins/drawreport/FanChart.py @@ -41,7 +41,7 @@ def log2(val): # gramps modules # #------------------------------------------------------------------------ -from Errors import ReportError +from gen.errors import ReportError from gen.plug.docgen import (FontStyle, ParagraphStyle, GraphicsStyle, FONT_SANS_SERIF, PARA_ALIGN_CENTER) from gen.plug.menu import EnumeratedListOption, NumberOption, PersonOption diff --git a/src/plugins/export/ExportFtree.py b/src/plugins/export/ExportFtree.py index 508476bd0..bced2926b 100644 --- a/src/plugins/export/ExportFtree.py +++ b/src/plugins/export/ExportFtree.py @@ -47,7 +47,6 @@ log = logging.getLogger(".WriteFtree") #------------------------------------------------------------------------- import Utils from ExportOptions import WriterOptionBox -import Errors from gui.glade import Glade #------------------------------------------------------------------------- diff --git a/src/plugins/export/ExportGedcom.py b/src/plugins/export/ExportGedcom.py index 95f3c4480..56f57c89b 100644 --- a/src/plugins/export/ExportGedcom.py +++ b/src/plugins/export/ExportGedcom.py @@ -44,7 +44,7 @@ import time import gen.lib import const import libgedcom -import Errors +from gen.errors import DatabaseError from ExportOptions import WriterOptionBox from gen.updatecallback import UpdateCallback from Utils import media_path_full @@ -1444,6 +1444,6 @@ def export_data(database, filename, user, option_box=None): except IOError, msg: msg2 = _("Could not create %s") % filename user.notify_error(msg2, str(msg)) - except Errors.DatabaseError, msg: + except DatabaseError, msg: user.notify_db_error(_("Export failed"), str(msg)) return ret diff --git a/src/plugins/export/ExportVCalendar.py b/src/plugins/export/ExportVCalendar.py index fcdc45578..9dfc1e955 100644 --- a/src/plugins/export/ExportVCalendar.py +++ b/src/plugins/export/ExportVCalendar.py @@ -50,7 +50,6 @@ log = logging.getLogger(".ExportVCal") from ExportOptions import WriterOptionBox import Utils from gen.lib import Date, EventType -import Errors from gui.glade import Glade class CalendarWriter(object): diff --git a/src/plugins/export/test/exportVCard_test.py b/src/plugins/export/test/exportVCard_test.py index f491005a1..19fb3fa0f 100644 --- a/src/plugins/export/test/exportVCard_test.py +++ b/src/plugins/export/test/exportVCard_test.py @@ -38,7 +38,6 @@ import libxml2 from libgrampsxml import GRAMPS_XML_VERSION from const import VERSION -import Errors import ExportVCard class VCardCheck(unittest.TestCase): diff --git a/src/plugins/gramplet/Children.py b/src/plugins/gramplet/Children.py index 59a877c43..2ffd36c61 100644 --- a/src/plugins/gramplet/Children.py +++ b/src/plugins/gramplet/Children.py @@ -26,7 +26,7 @@ from gen.ggettext import gettext as _ from gen.display.name import displayer as name_displayer from gen.utils import get_birth_or_fallback, get_death_or_fallback import gen.datehandler -import Errors +from gen.errors import WindowActiveError import gtk class Children(Gramplet): @@ -66,7 +66,7 @@ class Children(Gramplet): try: person = self.dbstate.db.get_person_from_handle(handle) EditPerson(self.dbstate, self.uistate, [], person) - except Errors.WindowActiveError: + except WindowActiveError: pass class PersonChildren(Children): diff --git a/src/plugins/gramplet/Citations.py b/src/plugins/gramplet/Citations.py index f9a46026c..ec1d5c7bc 100644 --- a/src/plugins/gramplet/Citations.py +++ b/src/plugins/gramplet/Citations.py @@ -24,7 +24,7 @@ from gui.editors import EditSource, EditCitation from gui.listmodel import ListModel, NOSORT from gen.plug import Gramplet from gen.ggettext import gettext as _ -import Errors +from gen.errors import WindowActiveError import gtk class Citations(Gramplet): @@ -236,7 +236,7 @@ class Citations(Gramplet): try: source = self.dbstate.db.get_source_from_handle(handle) EditSource(self.dbstate, self.uistate, [], source) - except Errors.WindowActiveError: + except WindowActiveError: pass def edit_citation(self, handle): @@ -248,7 +248,7 @@ class Citations(Gramplet): source_handle = citation.get_reference_handle() source = self.dbstate.db.get_source_from_handle(source_handle) EditCitation(self.dbstate, self.uistate, [], citation, source) - except Errors.WindowActiveError: + except WindowActiveError: pass class PersonCitations(Citations): diff --git a/src/plugins/gramplet/EditExifMetadata.py b/src/plugins/gramplet/EditExifMetadata.py index 0dae101f4..8f3fe30bd 100644 --- a/src/plugins/gramplet/EditExifMetadata.py +++ b/src/plugins/gramplet/EditExifMetadata.py @@ -58,7 +58,7 @@ from gen.plug import Gramplet from libmetadata import MetadataView, format_datetime from gui.widgets import ValidatableMaskedEntry -from Errors import ValidationError +from gen.errors import ValidationError from gui.dialog import QuestionDialog, OptionDialog from gen.lib import Date diff --git a/src/plugins/gramplet/Events.py b/src/plugins/gramplet/Events.py index a9ae70e0e..f396a0985 100644 --- a/src/plugins/gramplet/Events.py +++ b/src/plugins/gramplet/Events.py @@ -26,7 +26,7 @@ from gen.ggettext import gettext as _ from gen.display.name import displayer as name_displayer import gen.datehandler from gen.utils import get_birth_or_fallback, get_marriage_or_fallback -import Errors +from gen.errors import WindowActiveError import gtk import config @@ -122,7 +122,7 @@ class Events(Gramplet): try: event = self.dbstate.db.get_event_from_handle(handle) EditEvent(self.dbstate, self.uistate, [], event) - except Errors.WindowActiveError: + except WindowActiveError: pass class PersonEvents(Events): diff --git a/src/plugins/gramplet/FanChartGramplet.py b/src/plugins/gramplet/FanChartGramplet.py index 8a054721a..f550d07a6 100644 --- a/src/plugins/gramplet/FanChartGramplet.py +++ b/src/plugins/gramplet/FanChartGramplet.py @@ -58,7 +58,7 @@ 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 gen.errors import WindowActiveError from gui.editors import EditPerson import gui.utils @@ -672,7 +672,7 @@ class FanChartGramplet(Gramplet): if person: try: EditPerson(self.dbstate, self.uistate, [], person) - except Errors.WindowActiveError: + except WindowActiveError: pass return True return False diff --git a/src/plugins/gramplet/PersonResidence.py b/src/plugins/gramplet/PersonResidence.py index 71b8898c3..7946ae89a 100644 --- a/src/plugins/gramplet/PersonResidence.py +++ b/src/plugins/gramplet/PersonResidence.py @@ -25,7 +25,7 @@ from gui.listmodel import ListModel, NOSORT from gen.plug import Gramplet from gen.ggettext import gettext as _ import gen.datehandler -import Errors +from gen.errors import WindowActiveError import gtk class PersonResidence(Gramplet): @@ -118,5 +118,5 @@ class PersonResidence(Gramplet): try: event = self.dbstate.db.get_event_from_handle(handle) EditEvent(self.dbstate, self.uistate, [], event) - except Errors.WindowActiveError: + except WindowActiveError: pass diff --git a/src/plugins/graph/GVHourGlass.py b/src/plugins/graph/GVHourGlass.py index ca365e2e9..ff964911b 100644 --- a/src/plugins/graph/GVHourGlass.py +++ b/src/plugins/graph/GVHourGlass.py @@ -39,7 +39,7 @@ from gen.ggettext import gettext as _ # #------------------------------------------------------------------------ from gen.display.name import displayer as name_displayer -from Errors import ReportError +from gen.errors import ReportError from gen.plug.menu import (PersonOption, BooleanOption, NumberOption, EnumeratedListOption) from gen.plug.report import Report diff --git a/src/plugins/import/ImportGedcom.py b/src/plugins/import/ImportGedcom.py index fd9ad3f96..a35f5e80e 100644 --- a/src/plugins/import/ImportGedcom.py +++ b/src/plugins/import/ImportGedcom.py @@ -43,7 +43,7 @@ LOG = logging.getLogger(".GedcomImport") # GRAMPS modules # #------------------------------------------------------------------------ -import Errors +from gen.errors import DbError, GedcomError from gui.glade import Glade from libmixin import DbMixin import libgedcom @@ -111,7 +111,7 @@ def importData(database, filename, user): except IOError, msg: user.notify_error(_("%s could not be opened\n") % filename, str(msg)) return - except Errors.GedcomError, msg: + except GedcomError, msg: user.notify_error(_("Invalid GEDCOM file"), _("%s could not be imported") % filename + "\n" + str(msg)) return @@ -126,9 +126,9 @@ def importData(database, filename, user): msg = _("%s could not be opened\n") % filename user.notify_error(msg, str(msg)) return - except Errors.DbError, msg: + except DbError, msg: user.notify_db_error(str(msg.value)) return - except Errors.GedcomError, msg: + except GedcomError, msg: user.notify_error(_('Error reading GEDCOM file'), str(msg)) return diff --git a/src/plugins/import/ImportGeneWeb.py b/src/plugins/import/ImportGeneWeb.py index e9d0d19cb..ac61497c6 100644 --- a/src/plugins/import/ImportGeneWeb.py +++ b/src/plugins/import/ImportGeneWeb.py @@ -46,7 +46,7 @@ LOG = logging.getLogger(".ImportGeneWeb") # GRAMPS modules # #------------------------------------------------------------------------- -import Errors +from gen.errors import GedcomError import gen.lib from gen.db import DbTxn from htmlentitydefs import name2codepoint @@ -172,7 +172,7 @@ class GeneWebParser(object): else: LOG.warn("parse_geneweb_file(): Token >%s< unknown. line %d skipped: %s" % (fields[0],self.lineno,line)) - except Errors.GedcomError, err: + except GedcomError, err: self.errmsg(str(err)) t = time.time() - t diff --git a/src/plugins/import/ImportVCard.py b/src/plugins/import/ImportVCard.py index fec833940..64866cb02 100644 --- a/src/plugins/import/ImportVCard.py +++ b/src/plugins/import/ImportVCard.py @@ -48,7 +48,7 @@ LOG = logging.getLogger(".ImportVCard") # GRAMPS modules # #------------------------------------------------------------------------- -import Errors +from gen.errors import GrampsImportError import gen.lib from gen.db import DbTxn from gen.plug.utils import OpenFileOrStdin @@ -67,7 +67,7 @@ def importData(database, filename, user): except EnvironmentError, msg: user.notify_error(_("%s could not be opened\n") % filename, str(msg)) return - except Errors.GrampsImportError, msg: + except GrampsImportError, msg: user.notify_error(_("%s could not be opened\n") % filename, str(msg)) return return None # This module doesn't provide info about what got imported. @@ -306,7 +306,7 @@ class VCardParser(object): """Check the version of the VCard, only version 3.0 is supported.""" self.version = data if self.version != "3.0": - raise Errors.GrampsImportError(_("Import of VCards version %s is " + raise GrampsImportError(_("Import of VCards version %s is " "not supported by Gramps.") % self.version) def add_formatted_name(self, fields, data): diff --git a/src/plugins/import/ImportXml.py b/src/plugins/import/ImportXml.py index 2e34ee9f6..33047f5f6 100644 --- a/src/plugins/import/ImportXml.py +++ b/src/plugins/import/ImportXml.py @@ -47,7 +47,7 @@ import gen.mime import gen.lib from gen.db import DbTxn from gen.db.write import CLASS_TO_KEY_MAP -from Errors import GrampsImportError +from gen.errors import GrampsImportError import Utils import gen.datehandler from gen.display.name import displayer as name_displayer diff --git a/src/plugins/import/test/importVCard_test.py b/src/plugins/import/test/importVCard_test.py index edf6c7203..9943823cd 100644 --- a/src/plugins/import/test/importVCard_test.py +++ b/src/plugins/import/test/importVCard_test.py @@ -42,7 +42,6 @@ import libxslt from libgrampsxml import GRAMPS_XML_VERSION from const import ROOT_DIR, VERSION -import Errors import ImportVCard from ImportVCard import VCardParser diff --git a/src/plugins/lib/libcairodoc.py b/src/plugins/lib/libcairodoc.py index 9bab948c4..28c6fae19 100644 --- a/src/plugins/lib/libcairodoc.py +++ b/src/plugins/lib/libcairodoc.py @@ -46,7 +46,7 @@ from gen.plug.docgen import (BaseDoc, TextDoc, DrawDoc, ParagraphStyle, TableCellStyle, SOLID, FONT_SANS_SERIF, FONT_SERIF, FONT_MONOSPACE, PARA_ALIGN_CENTER, PARA_ALIGN_LEFT) from gen.plug.report import utils as ReportUtils -from Errors import PluginError +from gen.errors import PluginError from gen.plug.docbackend import CairoBackend import ImgManip diff --git a/src/plugins/lib/libgedcom.py b/src/plugins/lib/libgedcom.py index 91689abf5..069300952 100644 --- a/src/plugins/lib/libgedcom.py +++ b/src/plugins/lib/libgedcom.py @@ -112,7 +112,7 @@ LOG = logging.getLogger(".libgedcom") # GRAMPS modules # #------------------------------------------------------------------------- -import Errors +from gen.errors import GedcomError import const import gen.lib from gen.db import DbTxn @@ -2801,7 +2801,7 @@ class GedcomParser(UpdateCallback): # future to do something else self.__add_msg(self.__TRUNC_MSG) self.groups = None - raise Errors.GedcomError(self.__TRUNC_MSG) + raise GedcomError(self.__TRUNC_MSG) self.backoff = False return self.groups @@ -6903,7 +6903,7 @@ class GedcomParser(UpdateCallback): """ line = self.__get_next_line() if line.token != TOKEN_HEAD: - raise Errors.GedcomError("%s is not a GEDCOM file" % self.filename) + raise GedcomError("%s is not a GEDCOM file" % self.filename) def __parse_submission(self, line, state): """ @@ -7271,9 +7271,9 @@ class GedcomStageOne(object): input_file.seek(0) return codecs.EncodedFile(input_file, 'utf8', 'utf16') elif not line : - raise Errors.GedcomError(self.__EMPTY_GED) + raise GedcomError(self.__EMPTY_GED) elif line[0] == "\x00" or line[1] == "\x00": - raise Errors.GedcomError(self.__BAD_UTF16) + raise GedcomError(self.__BAD_UTF16) else: input_file.seek(0) return input_file diff --git a/src/plugins/lib/libhtmlbackend.py b/src/plugins/lib/libhtmlbackend.py index 08d1b777a..f4588e646 100644 --- a/src/plugins/lib/libhtmlbackend.py +++ b/src/plugins/lib/libhtmlbackend.py @@ -45,7 +45,7 @@ import os.path from gen.plug.docbackend import DocBackend from libhtml import Html from Utils import xml_lang -import Errors +from gen.errors import ReportError #------------------------------------------------------------------------ @@ -248,9 +248,9 @@ class HtmlBackend(DocBackend): except IOError,msg: errmsg = "%s\n%s" % (_("Could not create %s") % self._filename, msg) - raise Errors.ReportError(errmsg) + raise ReportError(errmsg) except: - raise Errors.ReportError(_("Could not create %s") % + raise ReportError(_("Could not create %s") % self._filename) if not os.path.isdir(self.datadirfull()): try: @@ -258,9 +258,9 @@ class HtmlBackend(DocBackend): except IOError,msg: errmsg = "%s\n%s" % (_("Could not create %s") % self.datadirfull(), msg) - raise Errors.ReportError(errmsg) + raise ReportError(errmsg) except: - raise Errors.ReportError(_("Could not create %s") % + raise ReportError(_("Could not create %s") % self.datadirfull()) self.html_page, self.html_header, self.html_body = Html.page( lang=xml_lang(), title=self.title) diff --git a/src/plugins/lib/libpersonview.py b/src/plugins/lib/libpersonview.py index 7e5865028..3d25ca781 100644 --- a/src/plugins/lib/libpersonview.py +++ b/src/plugins/lib/libpersonview.py @@ -53,7 +53,7 @@ from gui.views.listview import ListView import Utils from gen.display.name import displayer as name_displayer from gui.dialog import ErrorDialog, QuestionDialog -import Errors +from gen.errors import WindowActiveError from gui.views.bookmarks import PersonBookmarks import config from gui.ddtargets import DdTargets @@ -270,7 +270,7 @@ class BasePersonView(ListView): try: EditPerson(self.dbstate, self.uistate, [], person) - except Errors.WindowActiveError: + except WindowActiveError: pass def edit(self, obj): @@ -281,7 +281,7 @@ class BasePersonView(ListView): person = self.dbstate.db.get_person_from_handle(handle) try: EditPerson(self.dbstate, self.uistate, [], person) - except Errors.WindowActiveError: + except WindowActiveError: pass def remove(self, obj): diff --git a/src/plugins/lib/libplaceview.py b/src/plugins/lib/libplaceview.py index 52d495923..9534a4851 100644 --- a/src/plugins/lib/libplaceview.py +++ b/src/plugins/lib/libplaceview.py @@ -48,7 +48,7 @@ import gtk import gen.lib from gui.views.listview import ListView from gui.utils import add_menuitem -import Errors +from gen.errors import WindowActiveError from gui.views.bookmarks import PlaceBookmarks import config from gui.dialog import ErrorDialog @@ -366,7 +366,7 @@ class PlaceBaseView(ListView): def add(self, obj): try: EditPlace(self.dbstate, self.uistate, [], gen.lib.Place()) - except Errors.WindowActiveError: + except WindowActiveError: pass def remove(self, obj): @@ -397,7 +397,7 @@ class PlaceBaseView(ListView): place = self.dbstate.db.get_place_from_handle(handle) try: EditPlace(self.dbstate, self.uistate, [], place) - except Errors.WindowActiveError: + except WindowActiveError: pass def merge(self, obj): diff --git a/src/plugins/lib/maps/geography.py b/src/plugins/lib/maps/geography.py index 0e6d75e36..31ac0e7e0 100644 --- a/src/plugins/lib/maps/geography.py +++ b/src/plugins/lib/maps/geography.py @@ -50,7 +50,7 @@ import Utils from gen.display.name import displayer as _nd from gui.views.navigationview import NavigationView from libformatting import FormattingHelper -import Errors +from gen.errors import WindowActiveError import const import constfunc from gui.managedwindow import ManagedWindow @@ -732,7 +732,7 @@ class GeoGraphyView(OsmGps, NavigationView): person = self.dbstate.db.get_person_from_gramps_id(mark[8]) try: EditPerson(self.dbstate, self.uistate, [], person) - except Errors.WindowActiveError: + except WindowActiveError: pass def edit_family(self, menu, event, lat, lon, mark): @@ -744,7 +744,7 @@ class GeoGraphyView(OsmGps, NavigationView): family = self.dbstate.db.get_family_from_gramps_id(mark[11]) try: EditFamily(self.dbstate, self.uistate, [], family) - except Errors.WindowActiveError: + except WindowActiveError: pass def edit_event(self, menu, event, lat, lon, mark): @@ -756,7 +756,7 @@ class GeoGraphyView(OsmGps, NavigationView): event = self.dbstate.db.get_event_from_gramps_id(mark[10]) try: EditEvent(self.dbstate, self.uistate, [], event) - except Errors.WindowActiveError: + except WindowActiveError: pass def add_place(self, menu, event, lat, lon): @@ -812,7 +812,7 @@ class GeoGraphyView(OsmGps, NavigationView): try: EditPlace(self.dbstate, self.uistate, [], new_place) self.add_marker(None, None, plat, plon, None, True) - except Errors.WindowActiveError: + except WindowActiveError: pass def __edit_place(self, pcountry, pcounty, pstate, plat, plon): @@ -831,7 +831,7 @@ class GeoGraphyView(OsmGps, NavigationView): place.set_main_location(loc) try: EditPlace(self.dbstate, self.uistate, [], place) - except Errors.WindowActiveError: + except WindowActiveError: pass def __link_place(self, pcountry, pcounty, pstate, plat, plon): @@ -853,7 +853,7 @@ class GeoGraphyView(OsmGps, NavigationView): try: EditPlace(self.dbstate, self.uistate, [], place) self.add_marker(None, None, plat, plon, None, True) - except Errors.WindowActiveError: + except WindowActiveError: pass #------------------------------------------------------------------------- diff --git a/src/plugins/lib/maps/placeselection.py b/src/plugins/lib/maps/placeselection.py index da562806e..de7192d60 100644 --- a/src/plugins/lib/maps/placeselection.py +++ b/src/plugins/lib/maps/placeselection.py @@ -52,7 +52,7 @@ import gtk # Gramps Modules # #------------------------------------------------------------------------- -import Errors +from gen.errors import WindowActiveError from gui.managedwindow import ManagedWindow from osmGps import OsmGps @@ -101,7 +101,7 @@ class PlaceSelection(ManagedWindow, OsmGps): try: ManagedWindow.__init__(self, uistate, [], PlaceSelection) - except Errors.WindowActiveError: + except WindowActiveError: return self.uistate = uistate self.dbstate = dbstate diff --git a/src/plugins/textreport/AncestorReport.py b/src/plugins/textreport/AncestorReport.py index ec85ae0ca..ca4199ea3 100644 --- a/src/plugins/textreport/AncestorReport.py +++ b/src/plugins/textreport/AncestorReport.py @@ -39,7 +39,7 @@ from gen.ggettext import gettext as _ # #------------------------------------------------------------------------ from gen.display.name import displayer as global_name_display -from Errors import ReportError +from gen.errors import ReportError from gen.lib import ChildRefType from gen.plug.menu import (BooleanOption, NumberOption, PersonOption, EnumeratedListOption) diff --git a/src/plugins/textreport/BirthdayReport.py b/src/plugins/textreport/BirthdayReport.py index ff8db8f6f..3cb5a9c7f 100644 --- a/src/plugins/textreport/BirthdayReport.py +++ b/src/plugins/textreport/BirthdayReport.py @@ -38,7 +38,7 @@ import datetime, time # #------------------------------------------------------------------------ from gen.display.name import displayer as global_name_display -from Errors import ReportError +from gen.errors import ReportError from gen.lib import NameType, EventType, Name, Date, Person import Relationship from gen.plug.docgen import (FontStyle, ParagraphStyle, GraphicsStyle, diff --git a/src/plugins/textreport/DescendReport.py b/src/plugins/textreport/DescendReport.py index 866855046..f28d0f133 100644 --- a/src/plugins/textreport/DescendReport.py +++ b/src/plugins/textreport/DescendReport.py @@ -47,7 +47,7 @@ from gen.plug.docgen import (IndexMark, FontStyle, ParagraphStyle, from gen.plug.menu import (NumberOption, PersonOption, BooleanOption, EnumeratedListOption) from gen.display.name import displayer as global_name_display -from Errors import ReportError +from gen.errors import ReportError from gen.plug.report import Report from gen.plug.report import utils as ReportUtils from gen.plug.report import MenuReportOptions diff --git a/src/plugins/textreport/DetAncestralReport.py b/src/plugins/textreport/DetAncestralReport.py index bb1ced3f1..5be343139 100644 --- a/src/plugins/textreport/DetAncestralReport.py +++ b/src/plugins/textreport/DetAncestralReport.py @@ -43,7 +43,7 @@ from gen.ggettext import gettext as _ # #------------------------------------------------------------------------ from gen.display.name import displayer as global_name_display -from Errors import ReportError +from gen.errors import ReportError from gen.lib import EventType, FamilyRelType, Person, NoteType from gen.plug.docgen import (IndexMark, FontStyle, ParagraphStyle, FONT_SANS_SERIF, FONT_SERIF, diff --git a/src/plugins/textreport/DetDescendantReport.py b/src/plugins/textreport/DetDescendantReport.py index f8e792b2d..ac372dfc7 100644 --- a/src/plugins/textreport/DetDescendantReport.py +++ b/src/plugins/textreport/DetDescendantReport.py @@ -46,7 +46,7 @@ from functools import partial # #------------------------------------------------------------------------ from gen.display.name import displayer as global_name_display -from Errors import ReportError +from gen.errors import ReportError from gen.lib import FamilyRelType, Person, NoteType from gen.plug.menu import (BooleanOption, NumberOption, PersonOption, EnumeratedListOption) diff --git a/src/plugins/textreport/EndOfLineReport.py b/src/plugins/textreport/EndOfLineReport.py index 6010104d8..fd9d257bf 100644 --- a/src/plugins/textreport/EndOfLineReport.py +++ b/src/plugins/textreport/EndOfLineReport.py @@ -37,7 +37,7 @@ from gen.ggettext import gettext as _ # #------------------------------------------------------------------------ from gen.display.name import displayer as global_name_display -from Errors import ReportError +from gen.errors import ReportError from gen.plug.docgen import (IndexMark, FontStyle, ParagraphStyle, TableStyle, TableCellStyle, FONT_SANS_SERIF, INDEX_TYPE_TOC, PARA_ALIGN_CENTER) diff --git a/src/plugins/textreport/KinshipReport.py b/src/plugins/textreport/KinshipReport.py index 68df41ee7..bca203954 100644 --- a/src/plugins/textreport/KinshipReport.py +++ b/src/plugins/textreport/KinshipReport.py @@ -39,7 +39,7 @@ from gen.ggettext import gettext as _ # #------------------------------------------------------------------------ from gen.display.name import displayer as global_name_display -from Errors import ReportError +from gen.errors import ReportError import Relationship from gen.plug.docgen import (IndexMark, FontStyle, ParagraphStyle, FONT_SANS_SERIF, INDEX_TYPE_TOC, PARA_ALIGN_CENTER) diff --git a/src/plugins/textreport/NumberOfAncestorsReport.py b/src/plugins/textreport/NumberOfAncestorsReport.py index cce286b44..3a22c3a2d 100644 --- a/src/plugins/textreport/NumberOfAncestorsReport.py +++ b/src/plugins/textreport/NumberOfAncestorsReport.py @@ -43,7 +43,7 @@ import math # #------------------------------------------------------------------------ from gen.display.name import displayer as global_name_display -from Errors import ReportError +from gen.errors import ReportError from gen.plug.menu import PersonOption, EnumeratedListOption from gen.plug.docgen import (IndexMark, FontStyle, ParagraphStyle, FONT_SANS_SERIF, PARA_ALIGN_CENTER, diff --git a/src/plugins/textreport/TagReport.py b/src/plugins/textreport/TagReport.py index 351166f50..c16847ad4 100644 --- a/src/plugins/textreport/TagReport.py +++ b/src/plugins/textreport/TagReport.py @@ -47,7 +47,7 @@ from gen.plug.docgen import (IndexMark, FontStyle, ParagraphStyle, from gen.lib import NoteType from gen.filters import GenericFilterFactory, rules from gen.display.name import displayer as name_displayer -from Errors import ReportError +from gen.errors import ReportError import gen.datehandler #------------------------------------------------------------------------ diff --git a/src/plugins/tool/DateParserDisplayTest.py b/src/plugins/tool/DateParserDisplayTest.py index ec2a0622f..a6febaad1 100644 --- a/src/plugins/tool/DateParserDisplayTest.py +++ b/src/plugins/tool/DateParserDisplayTest.py @@ -117,7 +117,7 @@ class DateParserDisplayTest(tool.Tool): # d.set(gen.lib.Date.QUAL_NONE,gen.lib.Date.MOD_NONE, # gen.lib.Date.CAL_GREGORIAN,dateval[:l],"Text comment") # dates.append( d) - # except Errors.DateError, e: + # except DateError, e: # d.set_as_text("Date identified value correctly as invalid.\n%s" % e) # dates.append( d) # except: @@ -129,7 +129,7 @@ class DateParserDisplayTest(tool.Tool): # try: # d.set(gen.lib.Date.QUAL_NONE,gen.lib.Date.MOD_SPAN,gen.lib.Date.CAL_GREGORIAN,dateval[:l],"Text comment") # dates.append( d) - # except Errors.DateError, e: + # except DateError, e: # d.set_as_text("Date identified value correctly as invalid.\n%s" % e) # dates.append( d) # except: diff --git a/src/plugins/tool/EventCmp.py b/src/plugins/tool/EventCmp.py index f7c8fb9cb..c16715667 100644 --- a/src/plugins/tool/EventCmp.py +++ b/src/plugins/tool/EventCmp.py @@ -51,7 +51,7 @@ import Utils from gui.utils import ProgressMeter from docgen import ODSTab import const -import Errors +from gen.errors import WindowActiveError import gen.datehandler from gui.dialog import WarningDialog from gui.plug import tool @@ -171,7 +171,7 @@ class EventComparison(tool.Tool,ManagedWindow): try: FilterEditor('Person',const.CUSTOM_FILTERS, self.dbstate,self.uistate) - except Errors.WindowActiveError: + except WindowActiveError: pass def on_apply_clicked(self, obj): diff --git a/src/plugins/tool/FindDupes.py b/src/plugins/tool/FindDupes.py index f7f4b3fd9..b423c7aa2 100644 --- a/src/plugins/tool/FindDupes.py +++ b/src/plugins/tool/FindDupes.py @@ -44,7 +44,7 @@ import soundex from gen.display.name import displayer as name_displayer from gui.dialog import OkDialog from gui.listmodel import ListModel -import Errors +from gen.errors import WindowActiveError from gui.merge import MergePerson from gui.display import display_help from gui.managedwindow import ManagedWindow @@ -178,7 +178,7 @@ class Merge(tool.Tool,ManagedWindow): try: ShowMatches(self.dbstate,self.uistate,self.track, self.list,self.map,self.update) - except Errors.WindowActiveError: + except WindowActiveError: pass def find_potentials(self, thresh): diff --git a/src/plugins/tool/MergeCitations.py b/src/plugins/tool/MergeCitations.py index 72835a7ee..ca3962568 100644 --- a/src/plugins/tool/MergeCitations.py +++ b/src/plugins/tool/MergeCitations.py @@ -59,7 +59,7 @@ from gui.glade import Glade from gen.db import DbTxn from gen.lib import (Person, Family, Event, Place, MediaObject, Citation, Repository) -from Errors import MergeError +from gen.errors import MergeError #------------------------------------------------------------------------- # diff --git a/src/plugins/tool/NotRelated.py b/src/plugins/tool/NotRelated.py index 5a5064e8e..a02bf702c 100644 --- a/src/plugins/tool/NotRelated.py +++ b/src/plugins/tool/NotRelated.py @@ -221,7 +221,7 @@ class NotRelated(tool.ActivePersonTool, ManagedWindow) : if family: try: EditFamily(self.dbstate, self.uistate, [], family) - except Errors.WindowActiveError: + except WindowActiveError: pass elif personGid != '': # do we have a person? @@ -230,7 +230,7 @@ class NotRelated(tool.ActivePersonTool, ManagedWindow) : if person: try: EditPerson(self.dbstate, self.uistate, [], person) - except Errors.WindowActiveError: + except WindowActiveError: pass def on_help_clicked(self, obj): diff --git a/src/plugins/tool/RemoveUnused.py b/src/plugins/tool/RemoveUnused.py index f50744b72..a476d140f 100644 --- a/src/plugins/tool/RemoveUnused.py +++ b/src/plugins/tool/RemoveUnused.py @@ -55,7 +55,7 @@ import gobject # #------------------------------------------------------------------------- from gen.db import DbTxn -import Errors +from gen.errors import WindowActiveError from gui.managedwindow import ManagedWindow from gen.datehandler import displayer as _dd from gen.updatecallback import UpdateCallback @@ -344,7 +344,7 @@ class RemoveUnused(tool.Tool, ManagedWindow, UpdateCallback): ) exec(editor_str) editor(self.dbstate, self.uistate, [], obj) - except Errors.WindowActiveError: + except WindowActiveError: pass def get_image(self, column, cell, model, iter, user_data=None): diff --git a/src/plugins/tool/Verify.py b/src/plugins/tool/Verify.py index 242750155..12f7f5bae 100644 --- a/src/plugins/tool/Verify.py +++ b/src/plugins/tool/Verify.py @@ -39,7 +39,7 @@ try: from hashlib import md5 except ImportError: from md5 import md5 -import Errors +from gen.errors import WindowActiveError #------------------------------------------------------------------------ # @@ -317,7 +317,7 @@ class Verify(tool.Tool, ManagedWindow, UpdateCallback): self.vr = VerifyResults(self.dbstate, self.uistate, self.track) self.add_results = self.vr.add_results self.vr.load_ignored(self.db.full_name) - except Errors.WindowActiveError: + except WindowActiveError: pass self.uistate.window.window.set_cursor(gtk.gdk.Cursor(gtk.gdk.WATCH)) @@ -646,13 +646,13 @@ class VerifyResults(ManagedWindow): try: person = self.dbstate.db.get_person_from_handle(handle) EditPerson(self.dbstate, self.uistate, [], person) - except Errors.WindowActiveError: + except WindowActiveError: pass elif the_type == 'Family': try: family = self.dbstate.db.get_family_from_handle(handle) EditFamily(self.dbstate, self.uistate, [], family) - except Errors.WindowActiveError: + except WindowActiveError: pass def get_image(self, column, cell, model, iter, user_data=None): diff --git a/src/plugins/view/citationlistview.py b/src/plugins/view/citationlistview.py index 21e177daa..8ad091645 100644 --- a/src/plugins/view/citationlistview.py +++ b/src/plugins/view/citationlistview.py @@ -51,7 +51,7 @@ import gen.lib from gui.views.listview import ListView import Utils from gui.views.bookmarks import CitationBookmarks -import Errors +from gen.errors import WindowActiveError from gui.ddtargets import DdTargets from gui.dialog import ErrorDialog from gui.editors import EditCitation, DeleteCitationQuery @@ -267,7 +267,7 @@ class CitationListView(ListView): EditCitation editor with the new source and new citation. Called when the Add button is clicked. - If the window already exists (Errors.WindowActiveError), we ignore it. + If the window already exists (WindowActiveError), we ignore it. This prevents the dialog from coming up twice on the same object. However, since the window is identified by the Source object, and @@ -277,7 +277,7 @@ class CitationListView(ListView): try: EditCitation(self.dbstate, self.uistate, [], gen.lib.Citation(), gen.lib.Source()) - except Errors.WindowActiveError: + except WindowActiveError: pass def remove(self, obj): @@ -299,7 +299,7 @@ class CitationListView(ListView): citation = self.dbstate.db.get_citation_from_handle(handle) try: EditCitation(self.dbstate, self.uistate, [], citation) - except Errors.WindowActiveError: + except WindowActiveError: pass def __blocked_text(self): diff --git a/src/plugins/view/citationtreeview.py b/src/plugins/view/citationtreeview.py index f429ba4f5..51d894e64 100644 --- a/src/plugins/view/citationtreeview.py +++ b/src/plugins/view/citationtreeview.py @@ -52,7 +52,7 @@ import gen.lib from gui.views.listview import ListView import Utils from gui.views.bookmarks import CitationBookmarks -import Errors +from gen.errors import WindowActiveError from gui.ddtargets import DdTargets from gui.dialog import ErrorDialog from gui.editors import EditCitation, DeleteCitationQuery, EditSource, \ @@ -388,7 +388,7 @@ class CitationTreeView(ListView): new source. Called when the Add_source button is clicked. - If the window already exists (Errors.WindowActiveError), we ignore it. + If the window already exists (WindowActiveError), we ignore it. This prevents the dialog from coming up twice on the same object. However, since the window is identified by the Source object, and @@ -397,7 +397,7 @@ class CitationTreeView(ListView): """ try: EditSource(self.dbstate, self.uistate, [], gen.lib.Source()) - except Errors.WindowActiveError: + except WindowActiveError: pass def add(self, obj): @@ -410,7 +410,7 @@ class CitationTreeView(ListView): EditSource editor with the new source. Called when the Add button is clicked. - If the window already exists (Errors.WindowActiveError), we ignore it. + If the window already exists (WindowActiveError), we ignore it. This prevents the dialog from coming up twice on the same object. However, since the window is identified by the Source object, and @@ -420,7 +420,7 @@ class CitationTreeView(ListView): try: EditCitation(self.dbstate, self.uistate, [], gen.lib.Citation(), gen.lib.Source()) - except Errors.WindowActiveError: + except WindowActiveError: pass def share(self, obj): @@ -438,7 +438,7 @@ class CitationTreeView(ListView): try: EditCitation(self.dbstate, self.uistate, [], gen.lib.Citation(), source) - except Errors.WindowActiveError: + except WindowActiveError: from gui.dialog import WarningDialog WarningDialog(_("Cannot share this reference"), self.__blocked_text()) @@ -488,12 +488,12 @@ class CitationTreeView(ListView): if citation: try: EditCitation(self.dbstate, self.uistate, [], citation) - except Errors.WindowActiveError: + except WindowActiveError: pass else: # FIXME need try block here try: EditSource(self.dbstate, self.uistate, [], source) - except Errors.WindowActiveError: + except WindowActiveError: from gui.dialog import WarningDialog WarningDialog(_("Cannot share this reference"), self.__blocked_text2()) diff --git a/src/plugins/view/eventview.py b/src/plugins/view/eventview.py index cf6f0bf44..af50e5f68 100644 --- a/src/plugins/view/eventview.py +++ b/src/plugins/view/eventview.py @@ -50,7 +50,7 @@ import gen.lib from gui.views.listview import ListView from gui.views.treemodels import EventModel import Utils -import Errors +from gen.errors import WindowActiveError from gui.views.bookmarks import EventBookmarks import config from gui.ddtargets import DdTargets @@ -234,7 +234,7 @@ class EventView(ListView): def add(self, obj): try: EditEvent(self.dbstate, self.uistate, [], gen.lib.Event()) - except Errors.WindowActiveError: + except WindowActiveError: pass def remove(self, obj): @@ -261,7 +261,7 @@ class EventView(ListView): event = self.dbstate.db.get_event_from_handle(handle) try: EditEvent(self.dbstate, self.uistate, [], event) - except Errors.WindowActiveError: + except WindowActiveError: pass def merge(self, obj): diff --git a/src/plugins/view/familyview.py b/src/plugins/view/familyview.py index 353b79e1e..03a93a35b 100644 --- a/src/plugins/view/familyview.py +++ b/src/plugins/view/familyview.py @@ -50,7 +50,7 @@ from gui.views.listview import ListView from gui.views.treemodels import FamilyModel from gui.editors import EditFamily from gui.views.bookmarks import FamilyBookmarks -import Errors +from gen.errors import WindowActiveError import config from gui.dialog import ErrorDialog from gui.filters.sidebar import FamilySidebarFilter @@ -248,7 +248,7 @@ class FamilyView(ListView): family = gen.lib.Family() try: EditFamily(self.dbstate, self.uistate, [], family) - except Errors.WindowActiveError: + except WindowActiveError: pass def remove(self, obj): @@ -270,7 +270,7 @@ class FamilyView(ListView): family = self.dbstate.db.get_family_from_handle(handle) try: EditFamily(self.dbstate, self.uistate, [], family) - except Errors.WindowActiveError: + except WindowActiveError: pass def merge(self, obj): diff --git a/src/plugins/view/fanchartview.py b/src/plugins/view/fanchartview.py index ea1227864..d2151a5be 100644 --- a/src/plugins/view/fanchartview.py +++ b/src/plugins/view/fanchartview.py @@ -58,7 +58,7 @@ 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 +from gen.errors import WindowActiveError from gui.views.bookmarks import PersonBookmarks from gui.editors import EditPerson import gui.utils @@ -740,7 +740,7 @@ class FanChartView(NavigationView): if person: try: EditPerson(self.dbstate, self.uistate, [], person) - except Errors.WindowActiveError: + except WindowActiveError: pass return True return False diff --git a/src/plugins/view/geoevents.py b/src/plugins/view/geoevents.py index a0a86e466..c1331899d 100644 --- a/src/plugins/view/geoevents.py +++ b/src/plugins/view/geoevents.py @@ -57,7 +57,6 @@ _LOG = logging.getLogger("GeoGraphy.geoevents") import gen.lib import Utils import config -import Errors import gen.datehandler from gen.display.name import displayer as _nd from PlaceUtils import conv_lat_lon diff --git a/src/plugins/view/geofamily.py b/src/plugins/view/geofamily.py index d1614d592..6bb98f658 100644 --- a/src/plugins/view/geofamily.py +++ b/src/plugins/view/geofamily.py @@ -57,7 +57,6 @@ _LOG = logging.getLogger("GeoGraphy.geofamily") import gen.lib import Utils import config -import Errors import gen.datehandler from gen.display.name import displayer as _nd from PlaceUtils import conv_lat_lon diff --git a/src/plugins/view/geoperson.py b/src/plugins/view/geoperson.py index 94dc0fb9d..2a5e70c60 100644 --- a/src/plugins/view/geoperson.py +++ b/src/plugins/view/geoperson.py @@ -58,7 +58,6 @@ _LOG = logging.getLogger("GeoGraphy.geoperson") import gen.lib import Utils import config -import Errors import gen.datehandler from gen.display.name import displayer as _nd from PlaceUtils import conv_lat_lon diff --git a/src/plugins/view/geoplaces.py b/src/plugins/view/geoplaces.py index 6b8ffa5eb..dce0cc661 100644 --- a/src/plugins/view/geoplaces.py +++ b/src/plugins/view/geoplaces.py @@ -58,7 +58,6 @@ _LOG = logging.getLogger("GeoGraphy.geoplaces") import gen.lib import Utils import config -import Errors from gen.display.name import displayer as _nd from PlaceUtils import conv_lat_lon from gui.views.pageview import PageView diff --git a/src/plugins/view/mediaview.py b/src/plugins/view/mediaview.py index 7586ba833..91bfaa480 100644 --- a/src/plugins/view/mediaview.py +++ b/src/plugins/view/mediaview.py @@ -61,7 +61,7 @@ import gen.mime import gen.lib from gen.db import DbTxn from gui.editors import EditMedia, DeleteMediaQuery -import Errors +from gen.errors import WindowActiveError from gui.filters.sidebar import MediaSidebarFilter from gui.merge import MergeMedia from gui.ddtargets import DdTargets @@ -345,7 +345,7 @@ class MediaView(ListView): """Add a new media object to the media list""" try: EditMedia(self.dbstate, self.uistate, [], gen.lib.MediaObject()) - except Errors.WindowActiveError: + except WindowActiveError: pass def remove(self, obj): @@ -370,7 +370,7 @@ class MediaView(ListView): object = self.dbstate.db.get_object_from_handle(handle) try: EditMedia(self.dbstate, self.uistate, [], object) - except Errors.WindowActiveError: + except WindowActiveError: pass def merge(self, obj): diff --git a/src/plugins/view/noteview.py b/src/plugins/view/noteview.py index f68127806..7902b49c9 100644 --- a/src/plugins/view/noteview.py +++ b/src/plugins/view/noteview.py @@ -48,7 +48,7 @@ import gtk from gui.views.listview import ListView from gui.views.treemodels import NoteModel import Utils -import Errors +from gen.errors import WindowActiveError from gui.views.bookmarks import NoteBookmarks import config from gen.lib import Note @@ -239,7 +239,7 @@ class NoteView(ListView): def add(self, obj): try: EditNote(self.dbstate, self.uistate, [], Note()) - except Errors.WindowActiveError: + except WindowActiveError: pass def remove(self, obj): @@ -257,7 +257,7 @@ class NoteView(ListView): note = self.dbstate.db.get_note_from_handle(handle) try: EditNote(self.dbstate, self.uistate, [], note) - except Errors.WindowActiveError: + except WindowActiveError: pass def merge(self, obj): diff --git a/src/plugins/view/pedigreeview.py b/src/plugins/view/pedigreeview.py index b5cb5f035..42ce5d401 100644 --- a/src/plugins/view/pedigreeview.py +++ b/src/plugins/view/pedigreeview.py @@ -55,7 +55,7 @@ from Utils import (media_path_full, probably_alive, find_children, find_parents, find_witnessed_people) from libformatting import FormattingHelper from gui.thumbnails import get_thumbnail_path -import Errors +from gen.errors import WindowActiveError from gui.editors import EditPerson, EditFamily from gui.ddtargets import DdTargets import cPickle as pickle @@ -843,7 +843,7 @@ class PedigreeView(NavigationView): try: FilterEditor('Person', const.CUSTOM_FILTERS, self.dbstate, self.uistate) - except Errors.WindowActiveError: + except WindowActiveError: return def build_tree(self): @@ -1436,7 +1436,7 @@ class PedigreeView(NavigationView): if person: try: EditPerson(self.dbstate, self.uistate, [], person) - except Errors.WindowActiveError: + except WindowActiveError: return True return True return False @@ -1450,7 +1450,7 @@ class PedigreeView(NavigationView): if family: try: EditFamily(self.dbstate, self.uistate, [], family) - except Errors.WindowActiveError: + except WindowActiveError: return True return True return False @@ -1466,7 +1466,7 @@ class PedigreeView(NavigationView): family.add_child_ref(childref) try: EditFamily(self.dbstate, self.uistate, [], family) - except Errors.WindowActiveError: + except WindowActiveError: return def cb_copy_person_to_clipboard(self, obj, person_handle): diff --git a/src/plugins/view/personlistview.py b/src/plugins/view/personlistview.py index 0183f1f41..57f944d8b 100644 --- a/src/plugins/view/personlistview.py +++ b/src/plugins/view/personlistview.py @@ -35,7 +35,6 @@ from gui.views.listview import LISTTREE from libpersonview import BasePersonView from gui.views.treemodels.peoplemodel import PersonListModel import gen.lib -import Errors #------------------------------------------------------------------------- # diff --git a/src/plugins/view/persontreeview.py b/src/plugins/view/persontreeview.py index 840de066d..6e12f7cf4 100644 --- a/src/plugins/view/persontreeview.py +++ b/src/plugins/view/persontreeview.py @@ -35,7 +35,7 @@ from gui.views.listview import LISTTREE from libpersonview import BasePersonView from gui.views.treemodels.peoplemodel import PersonTreeModel import gen.lib -import Errors +from gen.errors import WindowActiveError from gui.editors import EditPerson from Utils import preset_name @@ -179,5 +179,5 @@ class PersonTreeView(BasePersonView): person.set_primary_name(name) try: EditPerson(self.dbstate, self.uistate, [], person) - except Errors.WindowActiveError: + except WindowActiveError: pass diff --git a/src/plugins/view/placetreeview.py b/src/plugins/view/placetreeview.py index 11e093422..75be81d97 100644 --- a/src/plugins/view/placetreeview.py +++ b/src/plugins/view/placetreeview.py @@ -32,7 +32,7 @@ from gui.views.listview import LISTTREE from libplaceview import PlaceBaseView from gui.views.treemodels.placemodel import PlaceTreeModel, COUNTRYLEVELS import gen.lib -import Errors +from gen.errors import WindowActiveError from gui.editors import EditPlace #------------------------------------------------------------------------- @@ -235,5 +235,5 @@ class PlaceTreeView(PlaceBaseView): place.get_main_location().set_county(level[2]) try: EditPlace(self.dbstate, self.uistate, [], place) - except Errors.WindowActiveError: + except WindowActiveError: pass diff --git a/src/plugins/view/relview.py b/src/plugins/view/relview.py index 167f77660..0315ec2ef 100644 --- a/src/plugins/view/relview.py +++ b/src/plugins/view/relview.py @@ -59,7 +59,7 @@ from gui.thumbnails import get_thumbnail_image import config from gui import widgets from gui.selectors import SelectorFactory -import Errors +from gen.errors import WindowActiveError from gui.views.bookmarks import PersonBookmarks import const from Utils import preset_name @@ -422,7 +422,7 @@ class RelationshipView(NavigationView): try: FilterEditor('Person', const.CUSTOM_FILTERS, self.dbstate, self.uistate) - except Errors.WindowActiveError: + except WindowActiveError: return def change_db(self, db): @@ -1236,7 +1236,7 @@ class RelationshipView(NavigationView): person = self.dbstate.db.get_person_from_handle(handle) try: EditPerson(self.dbstate, self.uistate, [], person) - except Errors.WindowActiveError: + except WindowActiveError: pass def write_relationship(self, box, family): @@ -1424,7 +1424,7 @@ class RelationshipView(NavigationView): person = self.dbstate.db.get_person_from_handle(handle) try: EditPerson(self.dbstate, self.uistate, [], person) - except Errors.WindowActiveError: + except WindowActiveError: pass def edit_family(self, obj, event, handle): @@ -1432,7 +1432,7 @@ class RelationshipView(NavigationView): family = self.dbstate.db.get_family_from_handle(handle) try: EditFamily(self.dbstate, self.uistate, [], family) - except Errors.WindowActiveError: + except WindowActiveError: pass def add_family(self, obj, event, handle): @@ -1449,7 +1449,7 @@ class RelationshipView(NavigationView): try: EditFamily(self.dbstate, self.uistate, [], family) - except Errors.WindowActiveError: + except WindowActiveError: pass def add_spouse(self, obj): @@ -1466,7 +1466,7 @@ class RelationshipView(NavigationView): try: EditFamily(self.dbstate, self.uistate, [], family) - except Errors.WindowActiveError: + except WindowActiveError: pass def edit_active(self, obj): @@ -1490,7 +1490,7 @@ class RelationshipView(NavigationView): try: EditPerson(self.dbstate, self.uistate, [], person, callback=callback) - except Errors.WindowActiveError: + except WindowActiveError: pass def callback_add_child(self, person, family_handle): @@ -1568,7 +1568,7 @@ class RelationshipView(NavigationView): try: EditFamily(self.dbstate, self.uistate, [], family) - except Errors.WindowActiveError: + except WindowActiveError: pass def add_parent_family(self, obj, event, handle): @@ -1582,7 +1582,7 @@ class RelationshipView(NavigationView): try: EditFamily(self.dbstate, self.uistate, [], family) - except Errors.WindowActiveError: + except WindowActiveError: pass def delete_family(self, obj, event, handle): @@ -1606,7 +1606,7 @@ class RelationshipView(NavigationView): import Reorder Reorder.Reorder(self.dbstate, self.uistate, [], self.get_active()) - except Errors.WindowActiveError: + except WindowActiveError: pass def config_connect(self): diff --git a/src/plugins/view/repoview.py b/src/plugins/view/repoview.py index 9e15e22cc..b99e67ebd 100644 --- a/src/plugins/view/repoview.py +++ b/src/plugins/view/repoview.py @@ -40,7 +40,7 @@ import gen.lib from gui.views.listview import ListView from gui.views.treemodels import RepositoryModel from gui.views.bookmarks import RepoBookmarks -import Errors +from gen.errors import WindowActiveError import config from gui.editors import EditRepository, DeleteRepositoryQuery from gui.ddtargets import DdTargets @@ -236,7 +236,7 @@ class RepositoryView(ListView): repos = self.dbstate.db.get_repository_from_handle(handle) try: EditRepository(self.dbstate, self.uistate, [], repos) - except Errors.WindowActiveError: + except WindowActiveError: pass def merge(self, obj): diff --git a/src/plugins/view/sourceview.py b/src/plugins/view/sourceview.py index cb89a3f75..40f7e6483 100644 --- a/src/plugins/view/sourceview.py +++ b/src/plugins/view/sourceview.py @@ -45,7 +45,7 @@ from gui.views.listview import ListView from gui.views.treemodels import SourceModel import Utils from gui.views.bookmarks import SourceBookmarks -import Errors +from gen.errors import WindowActiveError from gui.ddtargets import DdTargets from gui.dialog import ErrorDialog from gui.editors import EditSource, DeleteSrcQuery @@ -228,7 +228,7 @@ class SourceView(ListView): source = self.dbstate.db.get_source_from_handle(handle) try: EditSource(self.dbstate, self.uistate, [], source) - except Errors.WindowActiveError: + except WindowActiveError: pass def merge(self, obj):