From e9253804bec8f2b088f629bd69a95f1baec9cf86 Mon Sep 17 00:00:00 2001 From: Benny Malengier Date: Sun, 30 Sep 2012 10:30:08 +0000 Subject: [PATCH] GEPS 026: Replace 'make' for Gramps build a/Part 1: import from gen piece works partially b/Gramps as a stub to start gramps application svn: r20465 --- Gramps | 39 ++++ gramps.sh.in | 2 +- setup.py | 217 ++++++++++++------ src/__init__.py | 30 +++ src/gen/config.py | 6 +- src/gen/const.py.in | 8 +- src/gen/constfunc.py | 2 +- src/gen/datehandler/_date_bg.py | 2 +- src/gen/datehandler/_date_ca.py | 2 +- src/gen/datehandler/_date_cs.py | 2 +- src/gen/datehandler/_date_da.py | 2 +- src/gen/datehandler/_date_de.py | 2 +- src/gen/datehandler/_date_es.py | 2 +- src/gen/datehandler/_date_fi.py | 2 +- src/gen/datehandler/_date_fr.py | 2 +- src/gen/datehandler/_date_hr.py | 2 +- src/gen/datehandler/_date_it.py | 2 +- src/gen/datehandler/_date_lt.py | 2 +- src/gen/datehandler/_date_nb.py | 2 +- src/gen/datehandler/_date_nl.py | 2 +- src/gen/datehandler/_date_pl.py | 2 +- src/gen/datehandler/_date_pt.py | 2 +- src/gen/datehandler/_date_ru.py | 2 +- src/gen/datehandler/_date_sk.py | 2 +- src/gen/datehandler/_date_sl.py | 2 +- src/gen/datehandler/_date_sr.py | 2 +- src/gen/datehandler/_date_sv.py | 2 +- src/gen/datehandler/_date_zh.py | 2 +- src/gen/datehandler/_datedisplay.py | 2 +- src/gen/datehandler/_datehandler.py | 2 +- src/gen/datehandler/_dateparser.py | 2 +- src/gen/datehandler/_dateutils.py | 4 +- src/gen/datehandler/_grampslocale.py | 2 +- src/gen/db/backup.py | 4 +- src/gen/db/base.py | 11 +- src/gen/db/cursor.py | 2 +- src/gen/db/dbconst.py | 2 +- src/gen/db/dictionary.py | 18 +- src/gen/db/exceptions.py | 2 +- src/gen/db/read.py | 35 ++- src/gen/db/txn.py | 2 +- src/gen/db/undoredo.py | 10 +- src/gen/db/upgrade.py | 16 +- src/gen/db/write.py | 33 ++- src/gen/display/name.py | 7 +- src/gen/filters/__init__.py | 2 +- src/gen/filters/_filterlist.py | 4 +- src/gen/filters/_filterparser.py | 6 +- src/gen/filters/_genericfilter.py | 36 ++- src/gen/filters/_paramfilter.py | 4 +- src/gen/filters/rules/__init__.py | 39 ++-- src/gen/filters/rules/_changedsincebase.py | 4 +- src/gen/filters/rules/_everything.py | 4 +- src/gen/filters/rules/_hasattributebase.py | 6 +- src/gen/filters/rules/_hascitationbase.py | 8 +- src/gen/filters/rules/_haseventbase.py | 12 +- src/gen/filters/rules/_hasgallerybase.py | 4 +- src/gen/filters/rules/_hasgrampsid.py | 4 +- src/gen/filters/rules/_hasldsbase.py | 4 +- src/gen/filters/rules/_hasnotebase.py | 4 +- src/gen/filters/rules/_hasnoteregexbase.py | 4 +- src/gen/filters/rules/_hasnotesubstrbase.py | 4 +- .../filters/rules/_hasreferencecountbase.py | 4 +- src/gen/filters/rules/_hassourcebase.py | 4 +- src/gen/filters/rules/_hassourcecountbase.py | 4 +- src/gen/filters/rules/_hassourceofbase.py | 4 +- src/gen/filters/rules/_hastagbase.py | 4 +- .../filters/rules/_hastextmatchingregexpof.py | 2 +- .../rules/_hastextmatchingsubstringof.py | 4 +- src/gen/filters/rules/_isprivate.py | 4 +- src/gen/filters/rules/_ispublic.py | 2 +- .../filters/rules/_matcheseventfilterbase.py | 4 +- src/gen/filters/rules/_matchesfilterbase.py | 22 +- .../rules/_matchessourceconfidencebase.py | 4 +- .../filters/rules/_matchessourcefilterbase.py | 4 +- src/gen/filters/rules/_regexpidbase.py | 4 +- src/gen/filters/rules/_rule.py | 2 +- .../filters/rules/citation/_allcitations.py | 4 +- .../filters/rules/citation/_changedsince.py | 4 +- .../rules/citation/_citationprivate.py | 4 +- .../filters/rules/citation/_hascitation.py | 8 +- src/gen/filters/rules/citation/_hasgallery.py | 4 +- src/gen/filters/rules/citation/_hasidof.py | 4 +- src/gen/filters/rules/citation/_hasnote.py | 4 +- .../citation/_hasnotematchingsubstringof.py | 4 +- .../filters/rules/citation/_hasnoteregexp.py | 4 +- .../rules/citation/_hasreferencecountof.py | 4 +- src/gen/filters/rules/citation/_hassource.py | 4 +- .../filters/rules/citation/_matchesfilter.py | 4 +- .../rules/citation/_matchespagesubstringof.py | 4 +- .../citation/_matchesrepositoryfilter.py | 4 +- .../rules/citation/_matchessourcefilter.py | 4 +- src/gen/filters/rules/citation/_regexpidof.py | 4 +- src/gen/filters/rules/event/__init__.py | 2 +- src/gen/filters/rules/event/_allevents.py | 4 +- src/gen/filters/rules/event/_changedsince.py | 4 +- src/gen/filters/rules/event/_eventprivate.py | 4 +- src/gen/filters/rules/event/_hasattribute.py | 4 +- src/gen/filters/rules/event/_hascitation.py | 4 +- src/gen/filters/rules/event/_hasdata.py | 10 +- src/gen/filters/rules/event/_hasgallery.py | 4 +- src/gen/filters/rules/event/_hasidof.py | 4 +- src/gen/filters/rules/event/_hasnote.py | 4 +- .../event/_hasnotematchingsubstringof.py | 4 +- src/gen/filters/rules/event/_hasnoteregexp.py | 4 +- .../rules/event/_hasreferencecountof.py | 4 +- .../filters/rules/event/_hassourcecount.py | 4 +- src/gen/filters/rules/event/_hastype.py | 6 +- src/gen/filters/rules/event/_matchesfilter.py | 4 +- .../rules/event/_matchespersonfilter.py | 4 +- .../rules/event/_matchessourceconfidence.py | 4 +- .../rules/event/_matchessourcefilter.py | 4 +- src/gen/filters/rules/event/_regexpidof.py | 4 +- src/gen/filters/rules/family/_allfamilies.py | 4 +- src/gen/filters/rules/family/_changedsince.py | 4 +- src/gen/filters/rules/family/_childhasidof.py | 4 +- .../filters/rules/family/_childhasnameof.py | 4 +- .../filters/rules/family/_familyprivate.py | 4 +- .../filters/rules/family/_fatherhasidof.py | 4 +- .../filters/rules/family/_fatherhasnameof.py | 4 +- src/gen/filters/rules/family/_hasattribute.py | 4 +- src/gen/filters/rules/family/_hascitation.py | 4 +- src/gen/filters/rules/family/_hasevent.py | 4 +- src/gen/filters/rules/family/_hasgallery.py | 4 +- src/gen/filters/rules/family/_hasidof.py | 4 +- src/gen/filters/rules/family/_haslds.py | 4 +- src/gen/filters/rules/family/_hasnote.py | 4 +- .../family/_hasnotematchingsubstringof.py | 4 +- .../filters/rules/family/_hasnoteregexp.py | 4 +- .../rules/family/_hasreferencecountof.py | 4 +- src/gen/filters/rules/family/_hasreltype.py | 6 +- .../filters/rules/family/_hassourcecount.py | 4 +- src/gen/filters/rules/family/_hassourceof.py | 4 +- src/gen/filters/rules/family/_hastag.py | 4 +- src/gen/filters/rules/family/_isbookmarked.py | 4 +- .../filters/rules/family/_matchesfilter.py | 4 +- .../rules/family/_matchessourceconfidence.py | 4 +- .../filters/rules/family/_motherhasidof.py | 4 +- .../filters/rules/family/_motherhasnameof.py | 4 +- .../filters/rules/family/_regexpchildname.py | 4 +- .../filters/rules/family/_regexpfathername.py | 4 +- src/gen/filters/rules/family/_regexpidof.py | 4 +- .../filters/rules/family/_regexpmothername.py | 4 +- .../filters/rules/family/_searchchildname.py | 4 +- .../filters/rules/family/_searchfathername.py | 4 +- .../filters/rules/family/_searchmothername.py | 4 +- src/gen/filters/rules/media/_allmedia.py | 4 +- src/gen/filters/rules/media/_changedsince.py | 4 +- src/gen/filters/rules/media/_hasattribute.py | 4 +- src/gen/filters/rules/media/_hascitation.py | 4 +- src/gen/filters/rules/media/_hasidof.py | 4 +- src/gen/filters/rules/media/_hasmedia.py | 8 +- .../media/_hasnotematchingsubstringof.py | 4 +- src/gen/filters/rules/media/_hasnoteregexp.py | 4 +- .../rules/media/_hasreferencecountof.py | 4 +- .../filters/rules/media/_hassourcecount.py | 4 +- src/gen/filters/rules/media/_hassourceof.py | 4 +- src/gen/filters/rules/media/_hastag.py | 4 +- src/gen/filters/rules/media/_matchesfilter.py | 4 +- .../rules/media/_matchessourceconfidence.py | 4 +- src/gen/filters/rules/media/_mediaprivate.py | 4 +- src/gen/filters/rules/media/_regexpidof.py | 4 +- src/gen/filters/rules/note/_allnotes.py | 4 +- src/gen/filters/rules/note/_changedsince.py | 4 +- src/gen/filters/rules/note/_hasidof.py | 4 +- src/gen/filters/rules/note/_hasnote.py | 6 +- .../rules/note/_hasreferencecountof.py | 4 +- src/gen/filters/rules/note/_hastag.py | 4 +- src/gen/filters/rules/note/_matchesfilter.py | 4 +- .../filters/rules/note/_matchesregexpof.py | 4 +- .../filters/rules/note/_matchessubstringof.py | 4 +- src/gen/filters/rules/note/_noteprivate.py | 4 +- src/gen/filters/rules/note/_regexpidof.py | 4 +- src/gen/filters/rules/person/_changedsince.py | 4 +- .../person/_deeprelationshippathbetween.py | 8 +- src/gen/filters/rules/person/_disconnected.py | 4 +- src/gen/filters/rules/person/_everyone.py | 4 +- .../person/_familywithincompleteevent.py | 4 +- src/gen/filters/rules/person/_hasaddress.py | 4 +- .../filters/rules/person/_hasalternatename.py | 4 +- .../filters/rules/person/_hasassociation.py | 4 +- src/gen/filters/rules/person/_hasattribute.py | 4 +- src/gen/filters/rules/person/_hasbirth.py | 11 +- src/gen/filters/rules/person/_hascitation.py | 4 +- .../rules/person/_hascommonancestorwith.py | 6 +- .../_hascommonancestorwithfiltermatch.py | 4 +- src/gen/filters/rules/person/_hasdeath.py | 11 +- src/gen/filters/rules/person/_hasevent.py | 6 +- .../rules/person/_hasfamilyattribute.py | 4 +- .../filters/rules/person/_hasfamilyevent.py | 10 +- src/gen/filters/rules/person/_hasgallery.py | 4 +- src/gen/filters/rules/person/_hasidof.py | 4 +- src/gen/filters/rules/person/_haslds.py | 4 +- src/gen/filters/rules/person/_hasnameof.py | 6 +- .../rules/person/_hasnameorigintype.py | 6 +- src/gen/filters/rules/person/_hasnametype.py | 6 +- src/gen/filters/rules/person/_hasnickname.py | 4 +- src/gen/filters/rules/person/_hasnote.py | 4 +- .../person/_hasnotematchingsubstringof.py | 4 +- .../filters/rules/person/_hasnoteregexp.py | 4 +- .../filters/rules/person/_hasrelationship.py | 6 +- .../filters/rules/person/_hassourcecount.py | 4 +- src/gen/filters/rules/person/_hassourceof.py | 4 +- src/gen/filters/rules/person/_hastag.py | 4 +- .../person/_hastextmatchingsubstringof.py | 6 +- .../filters/rules/person/_hasunknowngender.py | 6 +- .../filters/rules/person/_havealtfamilies.py | 6 +- src/gen/filters/rules/person/_havechildren.py | 4 +- .../filters/rules/person/_incompletenames.py | 4 +- src/gen/filters/rules/person/_isancestorof.py | 4 +- .../rules/person/_isancestoroffiltermatch.py | 2 +- src/gen/filters/rules/person/_isbookmarked.py | 4 +- .../rules/person/_ischildoffiltermatch.py | 4 +- .../filters/rules/person/_isdefaultperson.py | 4 +- .../rules/person/_isdescendantfamilyof.py | 4 +- .../_isdescendantfamilyoffiltermatch.py | 2 +- .../filters/rules/person/_isdescendantof.py | 4 +- .../person/_isdescendantoffiltermatch.py | 2 +- .../rules/person/_isduplicatedancestorof.py | 4 +- src/gen/filters/rules/person/_isfemale.py | 6 +- .../_islessthannthgenerationancestorof.py | 4 +- ...ssthannthgenerationancestorofbookmarked.py | 4 +- ...hannthgenerationancestorofdefaultperson.py | 4 +- .../_islessthannthgenerationdescendantof.py | 4 +- src/gen/filters/rules/person/_ismale.py | 6 +- .../_ismorethannthgenerationancestorof.py | 4 +- .../_ismorethannthgenerationdescendantof.py | 4 +- .../rules/person/_isparentoffiltermatch.py | 4 +- .../filters/rules/person/_isrelatedwith.py | 4 +- .../rules/person/_issiblingoffiltermatch.py | 4 +- .../rules/person/_isspouseoffiltermatch.py | 4 +- src/gen/filters/rules/person/_iswitness.py | 7 +- .../rules/person/_matcheseventfilter.py | 4 +- .../filters/rules/person/_matchesfilter.py | 4 +- .../rules/person/_matchessourceconfidence.py | 4 +- src/gen/filters/rules/person/_matchidof.py | 4 +- .../filters/rules/person/_missingparent.py | 4 +- .../rules/person/_multiplemarriages.py | 4 +- src/gen/filters/rules/person/_nevermarried.py | 4 +- src/gen/filters/rules/person/_nobirthdate.py | 4 +- src/gen/filters/rules/person/_nodeathdate.py | 4 +- .../filters/rules/person/_peopleprivate.py | 4 +- src/gen/filters/rules/person/_peoplepublic.py | 4 +- .../person/_personwithincompleteevent.py | 4 +- .../filters/rules/person/_probablyalive.py | 10 +- src/gen/filters/rules/person/_regexpidof.py | 4 +- src/gen/filters/rules/person/_regexpname.py | 4 +- .../rules/person/_relationshippathbetween.py | 4 +- .../_relationshippathbetweenbookmarks.py | 4 +- src/gen/filters/rules/person/_searchname.py | 4 +- src/gen/filters/rules/place/_allplaces.py | 4 +- src/gen/filters/rules/place/_changedsince.py | 4 +- src/gen/filters/rules/place/_hascitation.py | 4 +- src/gen/filters/rules/place/_hasgallery.py | 4 +- src/gen/filters/rules/place/_hasidof.py | 4 +- src/gen/filters/rules/place/_hasnolatorlon.py | 4 +- src/gen/filters/rules/place/_hasnote.py | 4 +- .../place/_hasnotematchingsubstringof.py | 4 +- src/gen/filters/rules/place/_hasnoteregexp.py | 4 +- src/gen/filters/rules/place/_hasplace.py | 4 +- .../rules/place/_hasreferencecountof.py | 4 +- .../filters/rules/place/_hassourcecount.py | 4 +- src/gen/filters/rules/place/_hassourceof.py | 4 +- .../rules/place/_inlatlonneighborhood.py | 6 +- .../rules/place/_matcheseventfilter.py | 4 +- src/gen/filters/rules/place/_matchesfilter.py | 4 +- .../rules/place/_matchessourceconfidence.py | 4 +- src/gen/filters/rules/place/_placeprivate.py | 4 +- src/gen/filters/rules/place/_regexpidof.py | 4 +- src/gen/filters/rules/repository/_allrepos.py | 4 +- .../filters/rules/repository/_changedsince.py | 4 +- src/gen/filters/rules/repository/_hasidof.py | 4 +- .../repository/_hasnotematchingsubstringof.py | 4 +- .../rules/repository/_hasnoteregexp.py | 4 +- .../rules/repository/_hasreferencecountof.py | 4 +- src/gen/filters/rules/repository/_hasrepo.py | 6 +- .../rules/repository/_matchesfilter.py | 4 +- .../repository/_matchesnamesubstringof.py | 4 +- .../filters/rules/repository/_regexpidof.py | 4 +- .../filters/rules/repository/_repoprivate.py | 4 +- src/gen/filters/rules/source/__init__.py | 2 +- src/gen/filters/rules/source/_allsources.py | 4 +- src/gen/filters/rules/source/_changedsince.py | 4 +- src/gen/filters/rules/source/_hasgallery.py | 4 +- src/gen/filters/rules/source/_hasidof.py | 4 +- src/gen/filters/rules/source/_hasnote.py | 4 +- .../source/_hasnotematchingsubstringof.py | 4 +- .../filters/rules/source/_hasnoteregexp.py | 4 +- .../rules/source/_hasreferencecountof.py | 4 +- .../filters/rules/source/_hasrepository.py | 4 +- .../source/_hasrepositorycallnumberref.py | 4 +- .../filters/rules/source/_matchesfilter.py | 4 +- .../rules/source/_matchesrepositoryfilter.py | 4 +- .../rules/source/_matchestitlesubstringof.py | 4 +- src/gen/filters/rules/source/_regexpidof.py | 4 +- .../filters/rules/source/_sourceprivate.py | 4 +- src/gen/lib/__init__.py | 92 ++++---- src/gen/lib/address.py | 14 +- src/gen/lib/addressbase.py | 4 +- src/gen/lib/attrbase.py | 4 +- src/gen/lib/attribute.py | 12 +- src/gen/lib/attrtype.py | 4 +- src/gen/lib/childref.py | 14 +- src/gen/lib/childreftype.py | 4 +- src/gen/lib/citation.py | 8 +- src/gen/lib/date.py | 17 +- src/gen/lib/datebase.py | 2 +- src/gen/lib/event.py | 16 +- src/gen/lib/eventref.py | 14 +- src/gen/lib/eventroletype.py | 4 +- src/gen/lib/eventtype.py | 4 +- src/gen/lib/family.py | 22 +- src/gen/lib/familyreltype.py | 6 +- src/gen/lib/genderstats.py | 2 +- src/gen/lib/grampstype.py | 2 +- src/gen/lib/ldsord.py | 16 +- src/gen/lib/ldsordbase.py | 4 +- src/gen/lib/location.py | 6 +- src/gen/lib/markertype.py | 2 +- src/gen/lib/mediabase.py | 4 +- src/gen/lib/mediaobj.py | 12 +- src/gen/lib/mediaref.py | 14 +- src/gen/lib/name.py | 16 +- src/gen/lib/nameorigintype.py | 4 +- src/gen/lib/nametype.py | 4 +- src/gen/lib/note.py | 8 +- src/gen/lib/notetype.py | 4 +- src/gen/lib/person.py | 34 +-- src/gen/lib/personref.py | 12 +- src/gen/lib/place.py | 12 +- src/gen/lib/primaryobj.py | 8 +- src/gen/lib/privsrcnote.py | 4 +- src/gen/lib/repo.py | 10 +- src/gen/lib/reporef.py | 12 +- src/gen/lib/repotype.py | 4 +- src/gen/lib/researcher.py | 2 +- src/gen/lib/secondaryobj.py | 2 +- src/gen/lib/src.py | 10 +- src/gen/lib/srcmediatype.py | 4 +- src/gen/lib/styledtext.py | 2 +- src/gen/lib/styledtexttag.py | 2 +- src/gen/lib/styledtexttagtype.py | 4 +- src/gen/lib/surname.py | 6 +- src/gen/lib/surnamebase.py | 6 +- src/gen/lib/tableobj.py | 2 +- src/gen/lib/tag.py | 2 +- src/gen/lib/url.py | 8 +- src/gen/lib/urlbase.py | 4 +- src/gen/lib/urltype.py | 4 +- src/gen/plug/_docgenplugin.py | 4 +- src/gen/plug/_export.py | 2 +- src/gen/plug/_gramplet.py | 6 +- src/gen/plug/_import.py | 2 +- src/gen/plug/_manager.py | 6 +- src/gen/plug/_options.py | 6 +- src/gen/plug/_pluginreg.py | 8 +- src/gen/plug/docgen/graphdoc.py | 10 +- src/gen/plug/docgen/stylesheet.py | 2 +- src/gen/plug/menu/_boolean.py | 2 +- src/gen/plug/menu/_booleanlist.py | 2 +- src/gen/plug/menu/_color.py | 2 +- src/gen/plug/menu/_destination.py | 2 +- src/gen/plug/menu/_enumeratedlist.py | 2 +- src/gen/plug/menu/_family.py | 2 +- src/gen/plug/menu/_filter.py | 2 +- src/gen/plug/menu/_media.py | 2 +- src/gen/plug/menu/_note.py | 2 +- src/gen/plug/menu/_number.py | 2 +- src/gen/plug/menu/_option.py | 2 +- src/gen/plug/menu/_person.py | 2 +- src/gen/plug/menu/_personlist.py | 3 +- src/gen/plug/menu/_placelist.py | 2 +- src/gen/plug/menu/_string.py | 2 +- src/gen/plug/menu/_style.py | 4 +- src/gen/plug/menu/_surnamecolor.py | 2 +- src/gen/plug/menu/_text.py | 2 +- src/gen/plug/utils.py | 8 +- src/gen/utils/alive.py | 70 +++--- src/gen/utils/cast.py | 2 +- src/gen/utils/db.py | 25 +- src/gen/utils/file.py | 4 +- src/gen/utils/id.py | 2 +- src/gen/utils/place.py | 2 +- src/gen/utils/trans.py | 4 +- src/{gramps.py => grampsapp.py} | 12 +- src/gui/__init__.py | 2 +- src/gui/grampsgui.py | 1 + src/gui/user.py | 1 - src/gui/utils.py | 16 +- src/gui/viewmanager.py | 4 +- 390 files changed, 1303 insertions(+), 1094 deletions(-) create mode 100644 Gramps rename src/{gramps.py => grampsapp.py} (98%) diff --git a/Gramps b/Gramps new file mode 100644 index 000000000..ecf3c56c5 --- /dev/null +++ b/Gramps @@ -0,0 +1,39 @@ +# +# Gramps - a GTK+/GNOME based genealogy program +# +# Copyright (C) 2012 Benny Malengier +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# + +# $Id: grampsapp.py -1 $ + +""" +This is a stub to start Gramps. It is provided for the sole reason of being +able to run gramps from the source directory without setting PYTHONPATH + +From this position, import gramps works great +""" + +# here import gramps works. As __temporary__ workaround, we also put the gramps +# folder itself on the systempath +import sys, os +pathgramps = os.path.dirname(os.path.abspath(__file__)) +pathgramps += os.sep + 'gramps' +sys.path.append(pathgramps) + +#now start gramps +import gramps.grampsapp as app +app.main() diff --git a/gramps.sh.in b/gramps.sh.in index 60f5f0d91..d1cb8904a 100644 --- a/gramps.sh.in +++ b/gramps.sh.in @@ -25,4 +25,4 @@ PACKAGE=@PACKAGE@ export GRAMPSDIR=@datadir@/@PACKAGE@ -exec @PYTHON@ -O $GRAMPSDIR/gramps.py "$@" +exec @PYTHON@ -O $GRAMPSDIR/grampsapp.py "$@" diff --git a/setup.py b/setup.py index 3baca1251..38aa8d0bf 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,8 @@ # Gramps - a GTK+/GNOME based genealogy program # # Copyright (C) 2012 Nick Hall -# Copyright (C) 2012 Rob G. Healey +# Copyright (C) 2012 Rob G. Healey +# Copyright (C) 2012 Benny Malengier # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -25,13 +26,20 @@ ''' Gramps distutils module. ''' + +#check python version first +import sys +major, minor1, minor2, s, tmp = sys.version_info + +if (major==2 and minor1<7) or major<2 or major>3: + raise SystemExit("""Gramps requires Python 2.7 or later, Python 3 not supported.""") + from distutils import log from distutils.core import setup from distutils.util import convert_path, newer from distutils.command.build import build as _build from distutils.command.install import install as _install import os -import sys import glob import codecs import commands @@ -86,7 +94,8 @@ def build_trans(build_cmd): msg = 'ERROR: Building language translation files failed.' raise SystemExit(msg) - target = 'share/locale/' + lang + '/LC_MESSAGES' + #linux specific piece: + target = os.path.join(['share', 'locale', lang, 'LC_MESSAGES']) data_files.append((target, [mo_file])) log.info('Compiling %s >> %s.', po_file, target) @@ -96,7 +105,7 @@ def build_man(build_cmd): Compresses Gramps manual files ''' data_files = build_cmd.distribution.data_files - build_data = build_cmd.build_base + '/data/' + build_data = build_cmd.build_base + os.sep + 'data' + os.sep for man_dir, dirs, files in os.walk(os.path.join('data', 'man')): if 'gramps.1.in' in files: filename = os.path.join(man_dir, 'gramps.1.in') @@ -128,8 +137,8 @@ def build_man(build_cmd): filename = False lang = man_dir[8:] - src = build_data + 'man' + lang + '/gramps.1.gz' - target = 'share/man/' + lang + '/man1' + src = build_data + 'man' + lang + os.sep + 'gramps.1.gz' + target = os.path.join('share', 'man', lang, 'man1') data_files.append((target, [src])) log.info('Compiling %s >> %s.', src, target) @@ -143,14 +152,14 @@ def build_intl(build_cmd): data_files = build_cmd.distribution.data_files base = build_cmd.build_base - merge_files = (('data/gramps.desktop', - 'share/applications', + merge_files = (('data' + os.sep + 'gramps.desktop', + 'share' + os.sep + 'applications', '-d'), - ('data/gramps.keys', - 'share/mime-info', + ('data' + os.sep + 'gramps.keys', + 'share' + os.sep + 'mime-info', '-k'), - ('data/gramps.xml', - 'share/mime/packages', + ('data' + os.sep + 'gramps.xml', + 'share' + os.sep + 'mime' + os.sep + 'packages', '-x')) for filename, target, option in merge_files: @@ -160,11 +169,12 @@ def build_intl(build_cmd): if not(os.path.isdir(newdir) or os.path.islink(newdir)): os.makedirs(newdir) merge(filename + '.in', newfile, option) - data_files.append((target, [base + '/' + filename])) + data_files.append((target, [base + os.sep + filename])) for filename in INTLTOOL_FILES: filename = convert_path(filename) - merge(filename + '.in', filename, '-x', po_dir='/tmp', cache=False) + merge(filename + '.in', filename, '-x', po_dir=os.sep + 'tmp', + cache=False) def merge(in_file, out_file, option, po_dir='po', cache=True): ''' @@ -196,7 +206,7 @@ def install_template(install_cmd): os.makedirs(build_scripts) data_files = install_cmd.distribution.data_files write_gramps_script(install_cmd, build_scripts) - data_files.append(('bin', [build_scripts + '/gramps'])) + data_files.append(('bin', [build_scripts + os.sep + 'gramps'])) write_const_py(install_cmd) def write_gramps_script(install_cmd, build_scripts): @@ -222,12 +232,18 @@ def write_const_py(install_cmd): ''' const_py_in = os.path.join('src', 'gen', 'const.py.in') const_py = os.path.join('src', 'gen', 'const.py') - prefix = install_cmd.install_data - sysconfdir = os.path.join(prefix, 'etc') # Is this correct? + if hasattr(install_cmd, 'install_data'): + #during install + prefix = "'%s'" % install_cmd.install_data + sysconfdir = "'%s'" % os.path.join(install_cmd.install_data, 'etc') # Is this correct? + else: + #in build + prefix = 'os.path.join(os.path.dirname(__file__), os.pardir)' + sysconfdir = prefix + ' + "' + os.sep + 'etc"' # Is this correct? subst_vars = ((u'@VERSIONSTRING@', VERSION), - (u'@prefix@', prefix), - (u'@sysconfdir@', sysconfdir)) + (u'"@prefix@"', prefix), + (u'"@sysconfdir@"', sysconfdir)) substitute_variables(const_py_in, const_py, subst_vars) @@ -256,6 +272,7 @@ class build(_build): build_trans(self) build_man(self) build_intl(self) + write_const_py(self) _build.run(self) class install(_install): @@ -284,11 +301,84 @@ GRAMPS_FILES = glob.glob(os.path.join('example', 'gramps', '*.*')) PNG_FILES = glob.glob(os.path.join('data', '*.png')) SVG_FILES = glob.glob(os.path.join('data', '*.svg')) +data_list = [ + os.path.join('data', '*.txt'), + os.path.join('data', '*.xml'), + os.path.join('gui', 'glade', '*.glade'), + os.path.join('images','*.ico'), + os.path.join('images', '*.png'), + os.path.join('images', 'splash.jpg'), + os.path.join('images', '*.svg'), + os.path.join('images', '16x16', '*.png'), + os.path.join('images', '22x22', '*.png'), + os.path.join('images', '48x48', '*.png'), + os.path.join('images', 'scalable', '*.svg') + ] + +# add all subdirs of plugin with glade: +basedir = os.path.join('src', 'plugins') +for (dirpath, dirnames, filenames) in os.walk(basedir): + root, subdir = os.path.split(dirpath) + if subdir.startswith("."): + dirnames[:] = [] + continue + for dirname in dirnames: + # Skip hidden and system directories: + if dirname.startswith("."): + dirnames.remove(dirname) + #we add to data_list so glade , xml, files are found, we don't need the src/ part + data_list.append(os.path.join(dirpath[4:], '*.glade')) + data_list.append(os.path.join(dirpath[4:], '*.xml')) + data_list.append(os.path.join(dirpath[4:], '*.png')) + data_list.append(os.path.join(dirpath[4:], '*.svg')) + data_list.append(os.path.join(dirpath[4:], '*.css')) + data_list.append(os.path.join(dirpath[4:], '*.html')) + data_list.append(os.path.join(dirpath[4:], '*.js')) +data_list.append(os.path.join('plugins', 'webstuff', 'images', '*.gif')) +data_list.append(os.path.join('plugins', 'webstuff', 'images', '*.ico')) +# 'plugins' + os.sep + '*.glade', +# 'plugins' + os.sep + '*.py', +# 'plugins' + os.sep + 'docgen' + os.sep + '*.glade', +# 'plugins' + os.sep + 'docgen' + os.sep + '*.py', +# 'plugins' + os.sep + 'drawreport' + os.sep + '*.py', +# 'plugins' + os.sep + 'export' + os.sep + '*.glade', +# 'plugins' + os.sep + 'export' + os.sep + '*.py', +# 'plugins' + os.sep + 'gramplet' + os.sep + '*.py', +# 'plugins' + os.sep + 'graph' + os.sep + '*.py', +# 'plugins' + os.sep + 'import' + os.sep + '*.glade', +# 'plugins' + os.sep + 'import' + os.sep + '*.py', +# 'plugins' + os.sep + 'lib' + os.sep + '*.py', +# 'plugins' + os.sep + 'lib' + os.sep + '*.xml', +# 'plugins' + os.sep + 'lib' + os.sep + 'maps' + os.sep + '*.py', +# 'plugins' + os.sep + 'mapservices' + os.sep + '*.py', +# 'plugins' + os.sep + 'quickview' + os.sep + '*.py', +# 'plugins' + os.sep + 'rel' + os.sep + '*.py', +# 'plugins' + os.sep + 'sidebar' + os.sep + '*.py', +# 'plugins' + os.sep + 'textreport' + os.sep + '*.py', +# 'plugins' + os.sep + 'tool' + os.sep + '*.glade', +# 'plugins' + os.sep + 'tool' + os.sep + '*.py', +# 'plugins' + os.sep + 'view' + os.sep + '*.py', +# 'plugins' + os.sep + 'webreport' + os.sep + '*.py', +# 'plugins' + os.sep + 'webstuff' + os.sep + '*.html', +# 'plugins' + os.sep + 'webstuff' + os.sep + '*.py', +# 'plugins' + os.sep + 'webstuff' + os.sep + 'css' +# + os.sep + '*.css', +# 'plugins' + os.sep + 'webstuff' + os.sep + 'css' +# + os.sep + 'swanky-purse' + os.sep + '*.css', +# 'plugins' + os.sep + 'webstuff' + os.sep + 'css' +# + os.sep + 'swanky-purse' + os.sep + 'images' + os.sep + '*.png', +# 'plugins' + os.sep + 'webstuff' + os.sep + 'images' +# + os.sep + '*.png', +# 'plugins' + os.sep + 'webstuff' + os.sep + 'images' +# + os.sep + '*.svg', +# 'plugins' + os.sep + 'webstuff' + os.sep + 'javascript' +# + os.sep + '*.js'] + setup(name = 'gramps', description = ('Gramps (Genealogical Research and Analysis Management ' 'Programming System)'), long_description = ('Gramps (Genealogical Research and Analysis ' - 'Management Programming System) is a GNOME based ' + 'Management Programming System) is a full featured ' 'genealogy program supporting a Python based plugin ' 'system.'), version = VERSION, @@ -331,6 +421,7 @@ setup(name = 'gramps', 'gramps.gen.proxy', 'gramps.gen.simple', 'gramps.gen.utils', + 'gramps.gen.utils.docgen', 'gramps.gui', 'gramps.gui.editors', 'gramps.gui.editors.displaytabs', @@ -346,56 +437,38 @@ setup(name = 'gramps', 'gramps.gui.views', 'gramps.gui.views.treemodels', 'gramps.gui.widgets', - 'gramps.test'], - package_data={'gramps': ['data/*.txt', - 'data/*.xml', - 'gui/glade/*.glade', - 'images/*.ico', - 'images/*.png', - 'images/splash.jpg', - 'images/*.svg', - 'images/16x16/*.png', - 'images/22x22/*.png', - 'images/48x48/*.png', - 'images/scalable/*.svg', - 'plugins/*.glade', - 'plugins/*.py', - 'plugins/docgen/*.glade', - 'plugins/docgen/*.py', - 'plugins/drawreport/*.py', - 'plugins/export/*.glade', - 'plugins/export/*.py', - 'plugins/gramplet/*.py', - 'plugins/graph/*.py', - 'plugins/import/*.glade', - 'plugins/import/*.py', - 'plugins/lib/*.py', - 'plugins/lib/*.xml', - 'plugins/lib/maps/*.py', - 'plugins/mapservices/*.py', - 'plugins/quickview/*.py', - 'plugins/rel/*.py', - 'plugins/sidebar/*.py', - 'plugins/textreport/*.py', - 'plugins/tool/*.glade', - 'plugins/tool/*.py', - 'plugins/view/*.py', - 'plugins/webreport/*.py', - 'plugins/webstuff/*.html', - 'plugins/webstuff/*.py', - 'plugins/webstuff/css/*.css', - 'plugins/webstuff/css/swanky-purse/*.css', - 'plugins/webstuff/css/swanky-purse/images/*.png', - 'plugins/webstuff/images/*.gif', - 'plugins/webstuff/images/*.ico', - 'plugins/webstuff/images/*.png', - 'plugins/webstuff/images/*.svg', - 'plugins/webstuff/javascript/*.js']}, - data_files=[('share/mime-info', ['data/gramps.mime']), - ('share/icons/gnome/48x48/mimetypes', PNG_FILES), - ('share/icons/gnome/scalable/mimetypes', SVG_FILES), - ('share/icons', ['src/images/gramps.png']), - ('share/doc/gramps/example/gedcom', GEDCOM_FILES), - ('share/doc/gramps/example/gramps', GRAMPS_FILES), - ('share/doc/gramps', DOC_FILES)] + 'gramps.test', + 'gramps.plugins', + 'gramps.plugins.docgen', + 'gramps.plugins.drawreport', + 'gramps.plugins.export', + 'gramps.plugins.gramplet', + 'gramps.plugins.graph', + 'gramps.plugins.import', + 'gramps.plugins.lib', + 'gramps.plugins.lib.maps', + 'gramps.plugins.mapservices', + 'gramps.plugins.quickview', + 'gramps.plugins.rel', + 'gramps.plugins.sidebar', + 'gramps.plugins.textreport', + 'gramps.plugins.tool', + 'gramps.plugins.view', + 'gramps.plugins.webreport', + 'gramps.plugins.webstuff', + ], + package_data={'gramps': data_list}, + data_files=[('share' + os.sep + 'mime-info', + ['data' + os.sep + 'gramps.mime']), + ('share' + os.sep + 'icons' + os.sep + 'gnome' + os.sep + + '48x48' + os.sep + 'mimetypes', PNG_FILES), + ('share' + os.sep + 'icons' + os.sep + 'gnome' + os.sep + + 'scalable' + os.sep + 'mimetypes', SVG_FILES), + ('share' + os.sep + 'icons', ['src' + os.sep + 'images' + + os.sep + 'gramps.png']), + ('share' + os.sep + 'doc' + os.sep + 'gramps' + os.sep + + 'example' + os.sep + 'gedcom', GEDCOM_FILES), + ('share' + os.sep + 'doc' + os.sep + 'gramps' + os.sep + + 'example' + os.sep + 'gramps', GRAMPS_FILES), + ('share' + os.sep + 'doc' + os.sep + 'gramps', DOC_FILES)] ) diff --git a/src/__init__.py b/src/__init__.py index e69de29bb..dbb31000c 100644 --- a/src/__init__.py +++ b/src/__init__.py @@ -0,0 +1,30 @@ +# +# Gramps - a GTK+/GNOME based genealogy program +# +# Copyright (C) 2000-2007 Donald N. Allingham +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# gen/__init__.py +# $Id: __init__.py 19732 2012-05-31 23:46:57Z nick-h $ +# + +""" +The core gramps module provides the different packages + +Plugins are loaded dynamically, so they the plugin directory is not included +""" + +__all__ = ["gen", "cli", "gui"] diff --git a/src/gen/config.py b/src/gen/config.py index ee78e0d10..5785f75c6 100644 --- a/src/gen/config.py +++ b/src/gen/config.py @@ -34,7 +34,6 @@ This package implements access to GRAMPS configuration. # #--------------------------------------------------------------- import os, sys -from gen.ggettext import gettext as _ import logging #--------------------------------------------------------------- @@ -42,8 +41,9 @@ import logging # Gramps imports # #--------------------------------------------------------------- -from gen.const import HOME_DIR, USER_HOME, VERSION_DIR -from gen.utils.configmanager import ConfigManager +from ggettext import gettext as _ +from const import HOME_DIR, USER_HOME, VERSION_DIR +from utils.configmanager import ConfigManager #--------------------------------------------------------------- # diff --git a/src/gen/const.py.in b/src/gen/const.py.in index d78404413..67569ae15 100644 --- a/src/gen/const.py.in +++ b/src/gen/const.py.in @@ -34,7 +34,13 @@ Provides constants for other modules import os import sys import uuid -from gen.ggettext import sgettext as _ + +#------------------------------------------------------------------------- +# +# Gramps modules +# +#------------------------------------------------------------------------- +from ggettext import sgettext as _ #------------------------------------------------------------------------- # diff --git a/src/gen/constfunc.py b/src/gen/constfunc.py index 303f7fdc0..f7ecd86c8 100644 --- a/src/gen/constfunc.py +++ b/src/gen/constfunc.py @@ -40,7 +40,7 @@ import sys # Gramps modules # #------------------------------------------------------------------------- -from gen.const import WINDOWS, MACOS, LINUX +from const import WINDOWS, MACOS, LINUX #------------------------------------------------------------------------- # diff --git a/src/gen/datehandler/_date_bg.py b/src/gen/datehandler/_date_bg.py index 0b1929e39..2e4c4bbdd 100644 --- a/src/gen/datehandler/_date_bg.py +++ b/src/gen/datehandler/_date_bg.py @@ -37,7 +37,7 @@ import re # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib import Date +from ..lib.date import Date from _dateparser import DateParser from _datedisplay import DateDisplay from _datehandler import register_datehandler diff --git a/src/gen/datehandler/_date_ca.py b/src/gen/datehandler/_date_ca.py index 79c85a47f..8b2ba8f03 100644 --- a/src/gen/datehandler/_date_ca.py +++ b/src/gen/datehandler/_date_ca.py @@ -39,7 +39,7 @@ import re # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib import Date +from ..lib.date import Date from _dateparser import DateParser from _datedisplay import DateDisplay from _datehandler import register_datehandler diff --git a/src/gen/datehandler/_date_cs.py b/src/gen/datehandler/_date_cs.py index 57ad0ee04..5a26c62d5 100644 --- a/src/gen/datehandler/_date_cs.py +++ b/src/gen/datehandler/_date_cs.py @@ -37,7 +37,7 @@ import re # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib import Date +from ..lib.date import Date from _dateparser import DateParser from _datedisplay import DateDisplay from _datehandler import register_datehandler diff --git a/src/gen/datehandler/_date_da.py b/src/gen/datehandler/_date_da.py index bc1c19197..ae65533b8 100644 --- a/src/gen/datehandler/_date_da.py +++ b/src/gen/datehandler/_date_da.py @@ -37,7 +37,7 @@ import re # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib import Date +from ..lib.date import Date from _dateparser import DateParser from _datedisplay import DateDisplay from _datehandler import register_datehandler diff --git a/src/gen/datehandler/_date_de.py b/src/gen/datehandler/_date_de.py index a63f8882e..34aa5e00f 100644 --- a/src/gen/datehandler/_date_de.py +++ b/src/gen/datehandler/_date_de.py @@ -37,7 +37,7 @@ import re # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib import Date +from ..lib.date import Date from _dateparser import DateParser from _datedisplay import DateDisplay from _datehandler import register_datehandler diff --git a/src/gen/datehandler/_date_es.py b/src/gen/datehandler/_date_es.py index eb85b8cdc..f8d06c328 100644 --- a/src/gen/datehandler/_date_es.py +++ b/src/gen/datehandler/_date_es.py @@ -37,7 +37,7 @@ import re # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib import Date +from ..lib.date import Date from _dateparser import DateParser from _datedisplay import DateDisplay from _datehandler import register_datehandler diff --git a/src/gen/datehandler/_date_fi.py b/src/gen/datehandler/_date_fi.py index 6bebacc6f..303f5ce43 100644 --- a/src/gen/datehandler/_date_fi.py +++ b/src/gen/datehandler/_date_fi.py @@ -37,7 +37,7 @@ import re # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib import Date +from ..lib.date import Date from _dateparser import DateParser from _datedisplay import DateDisplay from _datehandler import register_datehandler diff --git a/src/gen/datehandler/_date_fr.py b/src/gen/datehandler/_date_fr.py index 9ae425362..d3de7ddf0 100644 --- a/src/gen/datehandler/_date_fr.py +++ b/src/gen/datehandler/_date_fr.py @@ -41,7 +41,7 @@ import re # #------------------------------------------------------------------------- -from gen.lib import Date +from ..lib.date import Date from _dateparser import DateParser from _datedisplay import DateDisplay from _datehandler import register_datehandler diff --git a/src/gen/datehandler/_date_hr.py b/src/gen/datehandler/_date_hr.py index 13d0a1209..b0fbcbaa1 100644 --- a/src/gen/datehandler/_date_hr.py +++ b/src/gen/datehandler/_date_hr.py @@ -39,7 +39,7 @@ import re # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib import Date +from ..lib.date import Date from _dateparser import DateParser from _datedisplay import DateDisplay from _datehandler import register_datehandler diff --git a/src/gen/datehandler/_date_it.py b/src/gen/datehandler/_date_it.py index 088098435..c8684443f 100644 --- a/src/gen/datehandler/_date_it.py +++ b/src/gen/datehandler/_date_it.py @@ -39,7 +39,7 @@ import re # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib import Date +from ..lib.date import Date from _dateparser import DateParser from _datedisplay import DateDisplay from _datehandler import register_datehandler diff --git a/src/gen/datehandler/_date_lt.py b/src/gen/datehandler/_date_lt.py index 4ccf66ba9..04d10c3ad 100644 --- a/src/gen/datehandler/_date_lt.py +++ b/src/gen/datehandler/_date_lt.py @@ -37,7 +37,7 @@ import re # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib import Date +from ..lib.date import Date from _dateparser import DateParser from _datedisplay import DateDisplay from _datehandler import register_datehandler diff --git a/src/gen/datehandler/_date_nb.py b/src/gen/datehandler/_date_nb.py index 3b53be5cc..5500b43ac 100644 --- a/src/gen/datehandler/_date_nb.py +++ b/src/gen/datehandler/_date_nb.py @@ -37,7 +37,7 @@ import re # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib import Date +from ..lib.date import Date from _dateparser import DateParser from _datedisplay import DateDisplay from _datehandler import register_datehandler diff --git a/src/gen/datehandler/_date_nl.py b/src/gen/datehandler/_date_nl.py index 0e1faa498..0e62746d9 100644 --- a/src/gen/datehandler/_date_nl.py +++ b/src/gen/datehandler/_date_nl.py @@ -43,7 +43,7 @@ import re # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib import Date +from ..lib.date import Date from _dateparser import DateParser from _datedisplay import DateDisplay from _datehandler import register_datehandler diff --git a/src/gen/datehandler/_date_pl.py b/src/gen/datehandler/_date_pl.py index 4c76eda13..3d2486891 100644 --- a/src/gen/datehandler/_date_pl.py +++ b/src/gen/datehandler/_date_pl.py @@ -40,7 +40,7 @@ import re # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib import Date +from ..lib.date import Date from _dateparser import DateParser from _datedisplay import DateDisplay from _datehandler import register_datehandler diff --git a/src/gen/datehandler/_date_pt.py b/src/gen/datehandler/_date_pt.py index 887f3eb4e..74923dc4a 100644 --- a/src/gen/datehandler/_date_pt.py +++ b/src/gen/datehandler/_date_pt.py @@ -39,7 +39,7 @@ import re # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib import Date +from ..lib.date import Date from _dateparser import DateParser from _datedisplay import DateDisplay from _datehandler import register_datehandler diff --git a/src/gen/datehandler/_date_ru.py b/src/gen/datehandler/_date_ru.py index 1cb1b9ebd..7dd9f5e02 100644 --- a/src/gen/datehandler/_date_ru.py +++ b/src/gen/datehandler/_date_ru.py @@ -37,7 +37,7 @@ import re # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib import Date +from ..lib.date import Date from _dateparser import DateParser from _datedisplay import DateDisplay from _datehandler import register_datehandler diff --git a/src/gen/datehandler/_date_sk.py b/src/gen/datehandler/_date_sk.py index 5518e9a55..04bf29aef 100644 --- a/src/gen/datehandler/_date_sk.py +++ b/src/gen/datehandler/_date_sk.py @@ -37,7 +37,7 @@ import re # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib import Date +from ..lib.date import Date from _dateparser import DateParser from _datedisplay import DateDisplay from _datehandler import register_datehandler diff --git a/src/gen/datehandler/_date_sl.py b/src/gen/datehandler/_date_sl.py index 8dddd4263..bd2e6c726 100644 --- a/src/gen/datehandler/_date_sl.py +++ b/src/gen/datehandler/_date_sl.py @@ -39,7 +39,7 @@ import re # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib import Date +from ..lib.date import Date from _dateparser import DateParser from _datedisplay import DateDisplay from _datehandler import register_datehandler diff --git a/src/gen/datehandler/_date_sr.py b/src/gen/datehandler/_date_sr.py index 371a41e7f..8f4476e62 100644 --- a/src/gen/datehandler/_date_sr.py +++ b/src/gen/datehandler/_date_sr.py @@ -40,7 +40,7 @@ import re # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib import Date +from ..lib.date import Date from _dateparser import DateParser from _datedisplay import DateDisplay from _datehandler import register_datehandler diff --git a/src/gen/datehandler/_date_sv.py b/src/gen/datehandler/_date_sv.py index eb12c61b2..ee31bd58d 100644 --- a/src/gen/datehandler/_date_sv.py +++ b/src/gen/datehandler/_date_sv.py @@ -37,7 +37,7 @@ import re # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib import Date +from ..lib.date import Date from _dateparser import DateParser from _datedisplay import DateDisplay from _datehandler import register_datehandler diff --git a/src/gen/datehandler/_date_zh.py b/src/gen/datehandler/_date_zh.py index 284f87907..58e249c5b 100644 --- a/src/gen/datehandler/_date_zh.py +++ b/src/gen/datehandler/_date_zh.py @@ -39,7 +39,7 @@ import re # #------------------------------------------------------------------------- -from gen.lib import Date +from ..lib.date import Date from _dateparser import DateParser from _datedisplay import DateDisplay from _datehandler import register_datehandler diff --git a/src/gen/datehandler/_datedisplay.py b/src/gen/datehandler/_datedisplay.py index 73cf5cb38..a3d004c9e 100644 --- a/src/gen/datehandler/_datedisplay.py +++ b/src/gen/datehandler/_datedisplay.py @@ -38,7 +38,7 @@ log = logging.getLogger(".DateDisplay") # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib import Date +from ..lib.date import Date import _grampslocale #------------------------------------------------------------------------- diff --git a/src/gen/datehandler/_datehandler.py b/src/gen/datehandler/_datehandler.py index 6f49ee93a..4ffb6b017 100644 --- a/src/gen/datehandler/_datehandler.py +++ b/src/gen/datehandler/_datehandler.py @@ -47,7 +47,7 @@ log = logging.getLogger(".gen.datehandler") #------------------------------------------------------------------------- from _dateparser import DateParser from _datedisplay import DateDisplay, DateDisplayEn -from gen.constfunc import win +from ..constfunc import win #------------------------------------------------------------------------- # diff --git a/src/gen/datehandler/_dateparser.py b/src/gen/datehandler/_dateparser.py index 00c4f3d40..ab05c4dab 100644 --- a/src/gen/datehandler/_dateparser.py +++ b/src/gen/datehandler/_dateparser.py @@ -48,7 +48,7 @@ log = logging.getLogger(".DateParser") # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib import Date, DateError +from ..lib.date import Date, DateError import _grampslocale #------------------------------------------------------------------------- diff --git a/src/gen/datehandler/_dateutils.py b/src/gen/datehandler/_dateutils.py index 3c4d94c6d..34147bc77 100644 --- a/src/gen/datehandler/_dateutils.py +++ b/src/gen/datehandler/_dateutils.py @@ -30,14 +30,14 @@ Class handling language-specific selection for date parser and displayer. # #------------------------------------------------------------------------- import time -from gen.lib import Date +from ..lib.date import Date #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.datehandler import LANG_TO_DISPLAY, LANG, parser, displayer +from . import LANG_TO_DISPLAY, LANG, parser, displayer #-------------------------------------------------------------- # diff --git a/src/gen/datehandler/_grampslocale.py b/src/gen/datehandler/_grampslocale.py index 36a9ca24d..cc211fa1a 100644 --- a/src/gen/datehandler/_grampslocale.py +++ b/src/gen/datehandler/_grampslocale.py @@ -22,7 +22,7 @@ # $Id$ import locale -from gen.constfunc import mac, win +from ..constfunc import mac, win """ Some OS environments do not support the locale.nl_langinfo() method diff --git a/src/gen/db/backup.py b/src/gen/db/backup.py index 9a44d6409..0ad09bf33 100644 --- a/src/gen/db/backup.py +++ b/src/gen/db/backup.py @@ -62,8 +62,8 @@ import cPickle as pickle # Gramps libs # #------------------------------------------------------------------------ -from gen.db.exceptions import DbException -from gen.db.write import FAMILY_TBL, PLACES_TBL, SOURCES_TBL, MEDIA_TBL, \ +from exceptions import DbException +from write import FAMILY_TBL, PLACES_TBL, SOURCES_TBL, MEDIA_TBL, \ EVENTS_TBL, PERSON_TBL, REPO_TBL, NOTE_TBL, TAG_TBL, META, CITATIONS_TBL #------------------------------------------------------------------------ diff --git a/src/gen/db/base.py b/src/gen/db/base.py index a2430c823..e2ddadcff 100644 --- a/src/gen/db/base.py +++ b/src/gen/db/base.py @@ -32,14 +32,15 @@ from this class. # Python libraries # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ..ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS libraries # #------------------------------------------------------------------------- -import gen.lib +from ..lib.childreftype import ChildRefType +from ..lib.childref import ChildRef from txn import DbTxn from exceptions import DbTransactionCancel @@ -1596,13 +1597,13 @@ class DbWriteBase(DbReadBase): raise NotImplementedError def add_child_to_family(self, family, child, - mrel=gen.lib.ChildRefType(), - frel=gen.lib.ChildRefType(), + mrel=ChildRefType(), + frel=ChildRefType(), trans=None): """ Adds a child to a family. """ - cref = gen.lib.ChildRef() + cref = ChildRef() cref.ref = child.handle cref.set_father_relation(frel) cref.set_mother_relation(mrel) diff --git a/src/gen/db/cursor.py b/src/gen/db/cursor.py index babe2e59d..663da802d 100644 --- a/src/gen/db/cursor.py +++ b/src/gen/db/cursor.py @@ -28,7 +28,7 @@ #------------------------------------------------------------------------- from cPickle import dumps, loads -from gen.config import config +from ..config import config if config.get('preferences.use-bsddb3'): from bsddb3 import db else: diff --git a/src/gen/db/dbconst.py b/src/gen/db/dbconst.py index d792f176f..e3f494e3b 100644 --- a/src/gen/db/dbconst.py +++ b/src/gen/db/dbconst.py @@ -66,7 +66,7 @@ DBLOCKS = 100000 # Maximum number of locks supported DBOBJECTS = 100000 # Maximum number of simultaneously locked objects DBUNDO = 1000 # Maximum size of undo buffer -from gen.config import config +from ..config import config if config.get('preferences.use-bsddb3'): from bsddb3.db import DB_CREATE, DB_AUTO_COMMIT, DB_DUP, DB_DUPSORT, DB_RDONLY else: diff --git a/src/gen/db/dictionary.py b/src/gen/db/dictionary.py index d441391bb..90f237f13 100644 --- a/src/gen/db/dictionary.py +++ b/src/gen/db/dictionary.py @@ -31,8 +31,8 @@ import base64 import time import gen import re -from gen.db import DbReadBase, DbWriteBase, DbTxn -from gen.db import (PERSON_KEY, +from . import DbReadBase, DbWriteBase, DbTxn +from . import (PERSON_KEY, FAMILY_KEY, CITATION_KEY, SOURCE_KEY, @@ -41,9 +41,17 @@ from gen.db import (PERSON_KEY, PLACE_KEY, REPOSITORY_KEY, NOTE_KEY) -from gen.utils.id import create_id -from gen.lib import (MediaObject, Person, Family, Source, Citation, Event, - Place, Repository, Note, Tag) +from ..utils.id import create_id +from ..lib.mediaobj import MediaObject +from ..lib.person import Person +from ..lib.family import Family +from ..lib.src import Source +from ..lib.citation import Citation +from ..lib.event import Event +from ..lib.place import Place +from ..lib.repo import Repository +from ..lib.note import Note +from ..lib.tag import Tag class Cursor(object): """ diff --git a/src/gen/db/exceptions.py b/src/gen/db/exceptions.py index 001d941c3..91ff64e48 100644 --- a/src/gen/db/exceptions.py +++ b/src/gen/db/exceptions.py @@ -27,7 +27,7 @@ # Standard python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ..ggettext import gettext as _ class DbException(Exception): diff --git a/src/gen/db/read.py b/src/gen/db/read.py index 5332881f4..ef8b58bcf 100644 --- a/src/gen/db/read.py +++ b/src/gen/db/read.py @@ -38,12 +38,12 @@ import locale import os from sys import maxint -from gen.config import config +from ..config import config if config.get('preferences.use-bsddb3'): from bsddb3 import db else: from bsddb import db -from gen.ggettext import gettext as _ +from ..ggettext import gettext as _ import re import logging @@ -53,15 +53,26 @@ import logging # GRAMPS libraries # #------------------------------------------------------------------------- -from gen.lib import (MediaObject, Person, Family, Source, Citation, Event, - Place, Repository, Note, Tag, GenderStats, Researcher, - NameOriginType) -from gen.db.dbconst import * -from gen.utils.callback import Callback -from gen.utils.cast import conv_dbstr_to_unicode -from gen.db import (BsddbBaseCursor, DbReadBase) -from gen.utils.id import create_id -from gen.errors import DbError +from ..lib.mediaobj import MediaObject +from ..lib.person import Person +from ..lib.family import Family +from ..lib.src import Source +from ..lib.citation import Citation +from ..lib.event import Event +from ..lib.place import Place +from ..lib.repo import Repository +from ..lib.note import Note +from ..lib.tag import Tag +from ..lib.genderstats import GenderStats +from ..lib.researcher import Researcher +from ..lib.nameorigintype import NameOriginType + +from dbconst import * +from ..utils.callback import Callback +from ..utils.cast import conv_dbstr_to_unicode +from . import (BsddbBaseCursor, DbReadBase) +from ..utils.id import create_id +from ..errors import DbError LOG = logging.getLogger(DBLOGNAME) LOG = logging.getLogger(".citation") @@ -70,7 +81,7 @@ LOG = logging.getLogger(".citation") # constants # #------------------------------------------------------------------------- -from gen.db.dbconst import * +from dbconst import * _SIGBASE = ('person', 'family', 'source', 'citation', 'event', 'media', 'place', 'repository', diff --git a/src/gen/db/txn.py b/src/gen/db/txn.py index 3f2e5428d..7a6a5cda6 100644 --- a/src/gen/db/txn.py +++ b/src/gen/db/txn.py @@ -41,7 +41,7 @@ from collections import defaultdict # Gramps modules # #------------------------------------------------------------------------- -from gen.db.dbconst import (DBLOGNAME, TXNADD, TXNUPD, TXNDEL) +from dbconst import (DBLOGNAME, TXNADD, TXNUPD, TXNDEL) _LOG = logging.getLogger(DBLOGNAME) diff --git a/src/gen/db/undoredo.py b/src/gen/db/undoredo.py index 2513e7283..908f521b9 100644 --- a/src/gen/db/undoredo.py +++ b/src/gen/db/undoredo.py @@ -36,21 +36,21 @@ import time, os import cPickle as pickle from collections import deque -from gen.config import config +from ..config import config if config.get('preferences.use-bsddb3'): from bsddb3 import db else: from bsddb import db -from gen.ggettext import gettext as _ +from ..ggettext import gettext as _ #------------------------------------------------------------------------- # # Gramps modules # #------------------------------------------------------------------------- -from gen.db.dbconst import * -from gen.db import BSDDBTxn -from gen.errors import DbError +from dbconst import * +from . import BSDDBTxn +from ..errors import DbError #------------------------------------------------------------------------- # diff --git a/src/gen/db/upgrade.py b/src/gen/db/upgrade.py index bf57a0df4..54574fc46 100644 --- a/src/gen/db/upgrade.py +++ b/src/gen/db/upgrade.py @@ -23,8 +23,8 @@ from __future__ import with_statement -from gen.lib.markertype import MarkerType -from gen.lib.tag import Tag +from ..lib.markertype import MarkerType +from ..lib.tag import Tag import time import logging LOG = logging.getLogger(".citation") @@ -34,17 +34,17 @@ from gen.ggettext import gettext as _ """ methods to upgrade a database from version 13 to current version """ -from gen.config import config +from ..config import config if config.get('preferences.use-bsddb3'): from bsddb3 import db else: from bsddb import db -from gen.db import BSDDBTxn -from gen.lib.nameorigintype import NameOriginType -from gen.db.write import _mkname, SURNAMES -from gen.db.dbconst import (PERSON_KEY, FAMILY_KEY, EVENT_KEY, +from . import BSDDBTxn +from ..lib.nameorigintype import NameOriginType +from write import _mkname, SURNAMES +from dbconst import (PERSON_KEY, FAMILY_KEY, EVENT_KEY, MEDIA_KEY, PLACE_KEY, REPOSITORY_KEY) -from gui.dialog import (InfoDialog) +from gramps.gui.dialog import (InfoDialog) def gramps_upgrade_16(self): """Upgrade database from version 15 to 16. This upgrade converts all diff --git a/src/gen/db/write.py b/src/gen/db/write.py index 810430486..dfc4de7a7 100644 --- a/src/gen/db/write.py +++ b/src/gen/db/write.py @@ -42,8 +42,8 @@ from functools import wraps import logging from sys import maxint -from gen.ggettext import gettext as _ -from gen.config import config +from ..ggettext import gettext as _ +from ..config import config if config.get('preferences.use-bsddb3'): from bsddb3 import dbshelve, db else: @@ -54,18 +54,29 @@ else: # Gramps modules # #------------------------------------------------------------------------- -from gen.lib import (GenderStats, Person, Family, Event, Place, Source, - Citation, MediaObject, Repository, Note, Tag) -from gen.db import (DbBsddbRead, DbWriteBase, BSDDBTxn, +from ..lib.person import Person +from ..lib.family import Family +from ..lib.src import Source +from ..lib.citation import Citation +from ..lib.event import Event +from ..lib.place import Place +from ..lib.repo import Repository +from ..lib.mediaobj import MediaObject +from ..lib.note import Note +from ..lib.tag import Tag +from ..lib.genderstats import GenderStats +from ..lib.researcher import Researcher + +from . import (DbBsddbRead, DbWriteBase, BSDDBTxn, DbTxn, BsddbBaseCursor, BsddbDowngradeError, DbVersionError, DbEnvironmentError, DbUpgradeRequiredError, find_surname, find_surname_name, DbUndoBSDDB as DbUndo) -from gen.db.dbconst import * -from gen.utils.callback import Callback -from gen.utils.cast import (conv_unicode_tosrtkey, conv_dbstr_to_unicode) -from gen.updatecallback import UpdateCallback -from gen.errors import DbError -from gen.constfunc import win +from dbconst import * +from ..utils.callback import Callback +from ..utils.cast import (conv_unicode_tosrtkey, conv_dbstr_to_unicode) +from ..updatecallback import UpdateCallback +from ..errors import DbError +from ..constfunc import win _LOG = logging.getLogger(DBLOGNAME) LOG = logging.getLogger(".citation") diff --git a/src/gen/display/name.py b/src/gen/display/name.py index 0299aeaa0..79b9a7d25 100644 --- a/src/gen/display/name.py +++ b/src/gen/display/name.py @@ -53,7 +53,7 @@ Specific symbols for parts of a name are defined: # Python modules # #------------------------------------------------------------------------- -from gen.ggettext import sgettext as _ +from ..ggettext import sgettext as _ import re #------------------------------------------------------------------------- @@ -61,10 +61,11 @@ import re # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib import Name, NameOriginType +from ..lib.name import Name +from ..lib.nameorigintype import NameOriginType try: - from gen.config import config + from ..config import config WITH_GRAMPS_CONFIG=True except ImportError: WITH_GRAMPS_CONFIG=False diff --git a/src/gen/filters/__init__.py b/src/gen/filters/__init__.py index 392e9f792..06d33d764 100644 --- a/src/gen/filters/__init__.py +++ b/src/gen/filters/__init__.py @@ -27,7 +27,7 @@ Package providing filtering framework for GRAMPS. #SystemFilters = None CustomFilters = None -from gen.const import CUSTOM_FILTERS +from ..const import CUSTOM_FILTERS from _filterlist import FilterList from _genericfilter import GenericFilter, GenericFilterFactory from _paramfilter import ParamFilter diff --git a/src/gen/filters/_filterlist.py b/src/gen/filters/_filterlist.py index 07d36b246..6309d9c2b 100644 --- a/src/gen/filters/_filterlist.py +++ b/src/gen/filters/_filterlist.py @@ -34,8 +34,8 @@ import sys # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters._filterparser import FilterParser -from gen.plug import BasePluginManager +from _filterparser import FilterParser +from ..plug import BasePluginManager PLUGMAN = BasePluginManager.get_instance() #------------------------------------------------------------------------- diff --git a/src/gen/filters/_filterparser.py b/src/gen/filters/_filterparser.py index 85352caae..30d2a9f12 100644 --- a/src/gen/filters/_filterparser.py +++ b/src/gen/filters/_filterparser.py @@ -26,15 +26,15 @@ # #------------------------------------------------------------------------- from xml.sax import handler -from gen.ggettext import gettext as _ +from ..ggettext import gettext as _ #------------------------------------------------------------------------- # # Gramps modules # #------------------------------------------------------------------------- -from gen.filters._genericfilter import GenericFilterFactory -from gen.filters import rules +from _genericfilter import GenericFilterFactory +import rules #------------------------------------------------------------------------- # diff --git a/src/gen/filters/_genericfilter.py b/src/gen/filters/_genericfilter.py index c91b78532..8b0c4a269 100644 --- a/src/gen/filters/_genericfilter.py +++ b/src/gen/filters/_genericfilter.py @@ -26,7 +26,23 @@ Package providing filtering framework for GRAMPS. """ from __future__ import with_statement -import gen.lib + +#------------------------------------------------------------------------ +# +# Gramps imports +# +#------------------------------------------------------------------------ +from ..lib.person import Person +from ..lib.family import Family +from ..lib.src import Source +from ..lib.citation import Citation +from ..lib.event import Event +from ..lib.place import Place +from ..lib.repo import Repository +from ..lib.mediaobj import MediaObject +from ..lib.note import Note +from ..lib.tag import Tag + #------------------------------------------------------------------------- # # GenericFilter @@ -110,7 +126,7 @@ class GenericFilter(object): return db.get_person_cursor() def make_obj(self): - return gen.lib.Person() + return Person() def find_from_handle(self, db, handle): return db.get_person_from_handle(handle) @@ -244,7 +260,7 @@ class GenericFamilyFilter(GenericFilter): return db.get_family_cursor() def make_obj(self): - return gen.lib.Family() + return Family() def find_from_handle(self, db, handle): return db.get_family_from_handle(handle) @@ -258,7 +274,7 @@ class GenericEventFilter(GenericFilter): return db.get_event_cursor() def make_obj(self): - return gen.lib.Event() + return Event() def find_from_handle(self, db, handle): return db.get_event_from_handle(handle) @@ -272,7 +288,7 @@ class GenericSourceFilter(GenericFilter): return db.get_source_cursor() def make_obj(self): - return gen.lib.Source() + return Source() def find_from_handle(self, db, handle): return db.get_source_from_handle(handle) @@ -286,7 +302,7 @@ class GenericCitationFilter(GenericFilter): return db.get_citation_cursor() def make_obj(self): - return gen.lib.Citation() + return Citation() def find_from_handle(self, db, handle): return db.get_citation_from_handle(handle) @@ -300,7 +316,7 @@ class GenericPlaceFilter(GenericFilter): return db.get_place_cursor() def make_obj(self): - return gen.lib.Place() + return Place() def find_from_handle(self, db, handle): return db.get_place_from_handle(handle) @@ -314,7 +330,7 @@ class GenericMediaFilter(GenericFilter): return db.get_media_cursor() def make_obj(self): - return gen.lib.MediaObject() + return MediaObject() def find_from_handle(self, db, handle): return db.get_object_from_handle(handle) @@ -328,7 +344,7 @@ class GenericRepoFilter(GenericFilter): return db.get_repository_cursor() def make_obj(self): - return gen.lib.Repository() + return Repository() def find_from_handle(self, db, handle): return db.get_repository_from_handle(handle) @@ -342,7 +358,7 @@ class GenericNoteFilter(GenericFilter): return db.get_note_cursor() def make_obj(self): - return gen.lib.Note() + return Note() def find_from_handle(self, db, handle): return db.get_note_from_handle(handle) diff --git a/src/gen/filters/_paramfilter.py b/src/gen/filters/_paramfilter.py index 88903f0e5..32dbf78a5 100644 --- a/src/gen/filters/_paramfilter.py +++ b/src/gen/filters/_paramfilter.py @@ -29,8 +29,8 @@ Package providing filtering framework for GRAMPS. # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters._genericfilter import GenericFilter -from gen.errors import FilterError +from _genericfilter import GenericFilter +from ..errors import FilterError #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/__init__.py b/src/gen/filters/rules/__init__.py index 09644d5e5..b413513cc 100644 --- a/src/gen/filters/rules/__init__.py +++ b/src/gen/filters/rules/__init__.py @@ -68,20 +68,27 @@ _Everything Match every object in the database """ # Need to expose this to be available for filter plugins: -# the plugins should say: from gen.filters.rules import Rule -from gen.filters.rules._rule import Rule +# the plugins should say: from .. import Rule +from _rule import Rule -from gen.filters.rules._everything import Everything -from gen.filters.rules._hasgrampsid import HasGrampsId -from gen.filters.rules._isprivate import IsPrivate -from gen.filters.rules._ispublic import IsPublic -from gen.filters.rules._hastextmatchingsubstringof import HasTextMatchingSubstringOf -from gen.filters.rules._hastextmatchingregexpof import HasTextMatchingRegexpOf -from gen.filters.rules._matchesfilterbase import MatchesFilterBase -from gen.filters.rules._matcheseventfilterbase import MatchesEventFilterBase -from gen.filters.rules._matchessourceconfidencebase import MatchesSourceConfidenceBase -from gen.filters.rules._matchessourcefilterbase import MatchesSourceFilterBase -from gen.filters.rules._changedsincebase import ChangedSinceBase - -from gen.filters.rules import (person, family, event, source, citation, place, - media, repository, note) +from _everything import Everything +from _hasgrampsid import HasGrampsId +from _isprivate import IsPrivate +from _ispublic import IsPublic +from _hastextmatchingsubstringof import HasTextMatchingSubstringOf +from _hastextmatchingregexpof import HasTextMatchingRegexpOf +from _matchesfilterbase import MatchesFilterBase +from _matcheseventfilterbase import MatchesEventFilterBase +from _matchessourceconfidencebase import MatchesSourceConfidenceBase +from _matchessourcefilterbase import MatchesSourceFilterBase +from _changedsincebase import ChangedSinceBase +#object filters +import person +import family +import event +import source +import citation +import place +import media +import repository +import note diff --git a/src/gen/filters/rules/_changedsincebase.py b/src/gen/filters/rules/_changedsincebase.py index e2f996b09..e9a4638a0 100644 --- a/src/gen/filters/rules/_changedsincebase.py +++ b/src/gen/filters/rules/_changedsincebase.py @@ -26,7 +26,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ...ggettext import gettext as _ import re import time @@ -35,7 +35,7 @@ import time # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from . import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/_everything.py b/src/gen/filters/rules/_everything.py index 77f6a967b..3dfb460c5 100644 --- a/src/gen/filters/rules/_everything.py +++ b/src/gen/filters/rules/_everything.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ...ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from . import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/_hasattributebase.py b/src/gen/filters/rules/_hasattributebase.py index 8b02626ec..3cf93e168 100644 --- a/src/gen/filters/rules/_hasattributebase.py +++ b/src/gen/filters/rules/_hasattributebase.py @@ -25,15 +25,15 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ...ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib import AttributeType -from gen.filters.rules import Rule +from ...lib.attrtype import AttributeType +from . import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/_hascitationbase.py b/src/gen/filters/rules/_hascitationbase.py index 5a39b1f33..c03722761 100644 --- a/src/gen/filters/rules/_hascitationbase.py +++ b/src/gen/filters/rules/_hascitationbase.py @@ -26,15 +26,15 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ...ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -import gen.datehandler -from gen.filters.rules import Rule +from ...datehandler import parser +from . import Rule #------------------------------------------------------------------------- # @@ -58,7 +58,7 @@ class HasCitationBase(Rule): self.date = None try: if self.list[1]: - self.date = gen.datehandler.parser.parse(self.list[1]) + self.date = parser.parse(self.list[1]) except: pass diff --git a/src/gen/filters/rules/_haseventbase.py b/src/gen/filters/rules/_haseventbase.py index a6414a7e1..2161acbad 100644 --- a/src/gen/filters/rules/_haseventbase.py +++ b/src/gen/filters/rules/_haseventbase.py @@ -25,17 +25,17 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ...ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -import gen.datehandler -from gen.lib import EventType -from gen.filters.rules import Rule -from gen.utils.db import get_participant_from_event +from ...datehandler import parser +from ...lib.eventtype import EventType +from . import Rule +from ...utils.db import get_participant_from_event #------------------------------------------------------------------------- # @@ -64,7 +64,7 @@ class HasEventBase(Rule): self.etype = None try: if self.list[1]: - self.date = gen.datehandler.parser.parse(self.list[1]) + self.date = parser.parse(self.list[1]) except: pass diff --git a/src/gen/filters/rules/_hasgallerybase.py b/src/gen/filters/rules/_hasgallerybase.py index b46f6233e..16ae2e9cc 100755 --- a/src/gen/filters/rules/_hasgallerybase.py +++ b/src/gen/filters/rules/_hasgallerybase.py @@ -28,14 +28,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ...ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from . import Rule #------------------------------------------------------------------------- # "People who have images" diff --git a/src/gen/filters/rules/_hasgrampsid.py b/src/gen/filters/rules/_hasgrampsid.py index b420cac60..652ff2b47 100644 --- a/src/gen/filters/rules/_hasgrampsid.py +++ b/src/gen/filters/rules/_hasgrampsid.py @@ -26,14 +26,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ...ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from . import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/_hasldsbase.py b/src/gen/filters/rules/_hasldsbase.py index 8d2b8630a..790d6d6f7 100755 --- a/src/gen/filters/rules/_hasldsbase.py +++ b/src/gen/filters/rules/_hasldsbase.py @@ -28,7 +28,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ...ggettext import gettext as _ #------------------------------------------------------------------------- # @@ -36,7 +36,7 @@ from gen.ggettext import gettext as _ # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from . import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/_hasnotebase.py b/src/gen/filters/rules/_hasnotebase.py index ec57d24e3..e73842518 100755 --- a/src/gen/filters/rules/_hasnotebase.py +++ b/src/gen/filters/rules/_hasnotebase.py @@ -29,14 +29,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ...ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from . import Rule #------------------------------------------------------------------------- # "Objects having notes" diff --git a/src/gen/filters/rules/_hasnoteregexbase.py b/src/gen/filters/rules/_hasnoteregexbase.py index de45a9acf..86e7ca4aa 100644 --- a/src/gen/filters/rules/_hasnoteregexbase.py +++ b/src/gen/filters/rules/_hasnoteregexbase.py @@ -26,14 +26,14 @@ # #------------------------------------------------------------------------- import re -from gen.ggettext import gettext as _ +from ...ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from . import Rule #------------------------------------------------------------------------- # "People having notes that contain a substring" diff --git a/src/gen/filters/rules/_hasnotesubstrbase.py b/src/gen/filters/rules/_hasnotesubstrbase.py index ef6cb2b94..ca2a5cf10 100644 --- a/src/gen/filters/rules/_hasnotesubstrbase.py +++ b/src/gen/filters/rules/_hasnotesubstrbase.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ...ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from . import Rule #------------------------------------------------------------------------- # "People having notes that contain a substring" diff --git a/src/gen/filters/rules/_hasreferencecountbase.py b/src/gen/filters/rules/_hasreferencecountbase.py index cd4771df5..497dbf4f8 100644 --- a/src/gen/filters/rules/_hasreferencecountbase.py +++ b/src/gen/filters/rules/_hasreferencecountbase.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ...ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from . import Rule #------------------------------------------------------------------------- # "Objects with a certain reference count" diff --git a/src/gen/filters/rules/_hassourcebase.py b/src/gen/filters/rules/_hassourcebase.py index 0481a1cce..7da17576f 100644 --- a/src/gen/filters/rules/_hassourcebase.py +++ b/src/gen/filters/rules/_hassourcebase.py @@ -26,14 +26,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ...ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from . import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/_hassourcecountbase.py b/src/gen/filters/rules/_hassourcecountbase.py index 2ffacbeb4..bd1228d49 100755 --- a/src/gen/filters/rules/_hassourcecountbase.py +++ b/src/gen/filters/rules/_hassourcecountbase.py @@ -28,14 +28,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ...ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from . import Rule #------------------------------------------------------------------------- # "Objects having sources" diff --git a/src/gen/filters/rules/_hassourceofbase.py b/src/gen/filters/rules/_hassourceofbase.py index 3083435bf..d8bc0d6c7 100644 --- a/src/gen/filters/rules/_hassourceofbase.py +++ b/src/gen/filters/rules/_hassourceofbase.py @@ -26,14 +26,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ...ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from . import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/_hastagbase.py b/src/gen/filters/rules/_hastagbase.py index 613e81ae9..0b62e294e 100644 --- a/src/gen/filters/rules/_hastagbase.py +++ b/src/gen/filters/rules/_hastagbase.py @@ -27,14 +27,14 @@ Rule that checks for an object with a particular tag. # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ...ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from . import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/_hastextmatchingregexpof.py b/src/gen/filters/rules/_hastextmatchingregexpof.py index acbe93916..64cc8b970 100644 --- a/src/gen/filters/rules/_hastextmatchingregexpof.py +++ b/src/gen/filters/rules/_hastextmatchingregexpof.py @@ -25,7 +25,7 @@ # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import HasTextMatchingSubstringOf +from . import HasTextMatchingSubstringOf #------------------------------------------------------------------------- # "HasTextMatchingRegexOf" diff --git a/src/gen/filters/rules/_hastextmatchingsubstringof.py b/src/gen/filters/rules/_hastextmatchingsubstringof.py index fb9650b6c..d3656a688 100644 --- a/src/gen/filters/rules/_hastextmatchingsubstringof.py +++ b/src/gen/filters/rules/_hastextmatchingsubstringof.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ...ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from . import Rule #------------------------------------------------------------------------- # "HasTextMatchingSubstringOf" diff --git a/src/gen/filters/rules/_isprivate.py b/src/gen/filters/rules/_isprivate.py index 2d1fec0f8..9489990cb 100644 --- a/src/gen/filters/rules/_isprivate.py +++ b/src/gen/filters/rules/_isprivate.py @@ -23,14 +23,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ...ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from . import Rule #------------------------------------------------------------------------- # "People marked private" diff --git a/src/gen/filters/rules/_ispublic.py b/src/gen/filters/rules/_ispublic.py index dfce8d8a8..b1a075d05 100644 --- a/src/gen/filters/rules/_ispublic.py +++ b/src/gen/filters/rules/_ispublic.py @@ -26,7 +26,7 @@ # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from . import Rule #------------------------------------------------------------------------- # "People marked public" diff --git a/src/gen/filters/rules/_matcheseventfilterbase.py b/src/gen/filters/rules/_matcheseventfilterbase.py index ab650af28..d7fbc375e 100644 --- a/src/gen/filters/rules/_matcheseventfilterbase.py +++ b/src/gen/filters/rules/_matcheseventfilterbase.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ...ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import MatchesFilterBase +from . import MatchesFilterBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/_matchesfilterbase.py b/src/gen/filters/rules/_matchesfilterbase.py index a51637fc5..d8b874b2e 100644 --- a/src/gen/filters/rules/_matchesfilterbase.py +++ b/src/gen/filters/rules/_matchesfilterbase.py @@ -25,15 +25,15 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ...ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -import gen.filters -from gen.filters.rules import Rule +from .. import CustomFilters +from . import Rule #------------------------------------------------------------------------- # @@ -55,24 +55,24 @@ class MatchesFilterBase(Rule): category = _('General filters') def prepare(self, db): - if gen.filters.CustomFilters: - filters = gen.filters.CustomFilters.get_filters_dict(self.namespace) + if CustomFilters: + filters = CustomFilters.get_filters_dict(self.namespace) if self.list[0] in filters: filt = filters[self.list[0]] for rule in filt.flist: rule.requestprepare(db) def reset(self): - if gen.filters.CustomFilters: - filters = gen.filters.CustomFilters.get_filters_dict(self.namespace) + if CustomFilters: + filters = CustomFilters.get_filters_dict(self.namespace) if self.list[0] in filters: filt = filters[self.list[0]] for rule in filt.flist: rule.requestreset() def apply(self, db, obj): - if gen.filters.CustomFilters: - filters = gen.filters.CustomFilters.get_filters_dict(self.namespace) + if CustomFilters: + filters = CustomFilters.get_filters_dict(self.namespace) if self.list[0] in filters: filt = filters[self.list[0]] return filt.check(db, obj.handle) @@ -82,8 +82,8 @@ class MatchesFilterBase(Rule): """ Return the selected filter or None. """ - if gen.filters.CustomFilters: - filters = gen.filters.CustomFilters.get_filters_dict(self.namespace) + if CustomFilters: + filters = CustomFilters.get_filters_dict(self.namespace) if self.list[0] in filters: return filters[self.list[0]] return None diff --git a/src/gen/filters/rules/_matchessourceconfidencebase.py b/src/gen/filters/rules/_matchessourceconfidencebase.py index 505466b72..f0281dc81 100644 --- a/src/gen/filters/rules/_matchessourceconfidencebase.py +++ b/src/gen/filters/rules/_matchessourceconfidencebase.py @@ -29,14 +29,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ...ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from . import Rule #------------------------------------------------------------------------- # "Confidence level" diff --git a/src/gen/filters/rules/_matchessourcefilterbase.py b/src/gen/filters/rules/_matchessourcefilterbase.py index 29917db7f..e803916fc 100644 --- a/src/gen/filters/rules/_matchessourcefilterbase.py +++ b/src/gen/filters/rules/_matchessourcefilterbase.py @@ -26,14 +26,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ...ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import MatchesFilterBase +from . import MatchesFilterBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/_regexpidbase.py b/src/gen/filters/rules/_regexpidbase.py index 55f67d882..99ed1a004 100644 --- a/src/gen/filters/rules/_regexpidbase.py +++ b/src/gen/filters/rules/_regexpidbase.py @@ -26,14 +26,14 @@ # #------------------------------------------------------------------------- import re -from gen.ggettext import gettext as _ +from ...ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from . import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/_rule.py b/src/gen/filters/rules/_rule.py index de2a90859..869474c35 100644 --- a/src/gen/filters/rules/_rule.py +++ b/src/gen/filters/rules/_rule.py @@ -30,7 +30,7 @@ Base class for filter rules. # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ...ggettext import gettext as _ import re #------------------------------------------------------------------------- diff --git a/src/gen/filters/rules/citation/_allcitations.py b/src/gen/filters/rules/citation/_allcitations.py index 543ed1fae..71bc3b32e 100644 --- a/src/gen/filters/rules/citation/_allcitations.py +++ b/src/gen/filters/rules/citation/_allcitations.py @@ -26,14 +26,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._everything import Everything +from .._everything import Everything #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/citation/_changedsince.py b/src/gen/filters/rules/citation/_changedsince.py index 9bf39eaf8..9d78b9fb4 100644 --- a/src/gen/filters/rules/citation/_changedsince.py +++ b/src/gen/filters/rules/citation/_changedsince.py @@ -26,14 +26,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._changedsincebase import ChangedSinceBase +from .._changedsincebase import ChangedSinceBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/citation/_citationprivate.py b/src/gen/filters/rules/citation/_citationprivate.py index e2446edd0..54c67407f 100644 --- a/src/gen/filters/rules/citation/_citationprivate.py +++ b/src/gen/filters/rules/citation/_citationprivate.py @@ -26,14 +26,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._isprivate import IsPrivate +from .._isprivate import IsPrivate #------------------------------------------------------------------------- # "Family marked private" diff --git a/src/gen/filters/rules/citation/_hascitation.py b/src/gen/filters/rules/citation/_hascitation.py index 1799d1a84..bf34bd536 100644 --- a/src/gen/filters/rules/citation/_hascitation.py +++ b/src/gen/filters/rules/citation/_hascitation.py @@ -28,15 +28,15 @@ Filter rule to match citation data. # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule -import gen.datehandler +from .. import Rule +from ....datehandler import parser #------------------------------------------------------------------------- # @@ -57,7 +57,7 @@ class HasCitation(Rule): self.date = None try: if self.list[1]: - self.date = gen.datehandler.parser.parse(self.list[1]) + self.date = parser.parse(self.list[1]) except: pass diff --git a/src/gen/filters/rules/citation/_hasgallery.py b/src/gen/filters/rules/citation/_hasgallery.py index e30924b58..69c3b0519 100755 --- a/src/gen/filters/rules/citation/_hasgallery.py +++ b/src/gen/filters/rules/citation/_hasgallery.py @@ -28,14 +28,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hasgallerybase import HasGalleryBase +from .._hasgallerybase import HasGalleryBase #------------------------------------------------------------------------- # "Sources who have media object reference" diff --git a/src/gen/filters/rules/citation/_hasidof.py b/src/gen/filters/rules/citation/_hasidof.py index f480cab06..7dffeddf0 100644 --- a/src/gen/filters/rules/citation/_hasidof.py +++ b/src/gen/filters/rules/citation/_hasidof.py @@ -26,14 +26,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import HasGrampsId +from .. import HasGrampsId #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/citation/_hasnote.py b/src/gen/filters/rules/citation/_hasnote.py index a56602a74..46135b009 100755 --- a/src/gen/filters/rules/citation/_hasnote.py +++ b/src/gen/filters/rules/citation/_hasnote.py @@ -29,14 +29,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hasnotebase import HasNoteBase +from .._hasnotebase import HasNoteBase #------------------------------------------------------------------------- # "Sources having notes" diff --git a/src/gen/filters/rules/citation/_hasnotematchingsubstringof.py b/src/gen/filters/rules/citation/_hasnotematchingsubstringof.py index 3d4873a03..45c27552f 100644 --- a/src/gen/filters/rules/citation/_hasnotematchingsubstringof.py +++ b/src/gen/filters/rules/citation/_hasnotematchingsubstringof.py @@ -26,14 +26,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hasnotesubstrbase import HasNoteSubstrBase +from .._hasnotesubstrbase import HasNoteSubstrBase #------------------------------------------------------------------------- # "Events having notes that contain a substring" diff --git a/src/gen/filters/rules/citation/_hasnoteregexp.py b/src/gen/filters/rules/citation/_hasnoteregexp.py index 1b00e2ae2..cd32e9607 100644 --- a/src/gen/filters/rules/citation/_hasnoteregexp.py +++ b/src/gen/filters/rules/citation/_hasnoteregexp.py @@ -26,14 +26,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hasnoteregexbase import HasNoteRegexBase +from .._hasnoteregexbase import HasNoteRegexBase #------------------------------------------------------------------------- # "Sources having notes that contain a substring" diff --git a/src/gen/filters/rules/citation/_hasreferencecountof.py b/src/gen/filters/rules/citation/_hasreferencecountof.py index f2cf11763..4f2c8a7c6 100644 --- a/src/gen/filters/rules/citation/_hasreferencecountof.py +++ b/src/gen/filters/rules/citation/_hasreferencecountof.py @@ -26,14 +26,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hasreferencecountbase import HasReferenceCountBase +from .._hasreferencecountbase import HasReferenceCountBase #------------------------------------------------------------------------- # "Source objects with a certain reference count" diff --git a/src/gen/filters/rules/citation/_hassource.py b/src/gen/filters/rules/citation/_hassource.py index 72a51299f..5bd2bf4b9 100644 --- a/src/gen/filters/rules/citation/_hassource.py +++ b/src/gen/filters/rules/citation/_hassource.py @@ -29,14 +29,14 @@ Filter rule to match citation with a particular source. # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hassourcebase import HasSourceBase +from .._hassourcebase import HasSourceBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/citation/_matchesfilter.py b/src/gen/filters/rules/citation/_matchesfilter.py index 2df8034ba..23f66af21 100644 --- a/src/gen/filters/rules/citation/_matchesfilter.py +++ b/src/gen/filters/rules/citation/_matchesfilter.py @@ -26,14 +26,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._matchesfilterbase import MatchesFilterBase +from .._matchesfilterbase import MatchesFilterBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/citation/_matchespagesubstringof.py b/src/gen/filters/rules/citation/_matchespagesubstringof.py index cc9bbd5e1..60c555c24 100644 --- a/src/gen/filters/rules/citation/_matchespagesubstringof.py +++ b/src/gen/filters/rules/citation/_matchespagesubstringof.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from .. import Rule #------------------------------------------------------------------------- # "Sources having a title that contain a substring" diff --git a/src/gen/filters/rules/citation/_matchesrepositoryfilter.py b/src/gen/filters/rules/citation/_matchesrepositoryfilter.py index 8000b34d5..602e570f3 100644 --- a/src/gen/filters/rules/citation/_matchesrepositoryfilter.py +++ b/src/gen/filters/rules/citation/_matchesrepositoryfilter.py @@ -28,14 +28,14 @@ #------------------------------------------------------------------------- import logging LOG = logging.getLogger(".citation") -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import MatchesFilterBase +from .. import MatchesFilterBase #------------------------------------------------------------------------- # "Sources which reference a repository by selection" diff --git a/src/gen/filters/rules/citation/_matchessourcefilter.py b/src/gen/filters/rules/citation/_matchessourcefilter.py index 31a091efa..3f018e850 100644 --- a/src/gen/filters/rules/citation/_matchessourcefilter.py +++ b/src/gen/filters/rules/citation/_matchessourcefilter.py @@ -27,14 +27,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import MatchesFilterBase +from .. import MatchesFilterBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/citation/_regexpidof.py b/src/gen/filters/rules/citation/_regexpidof.py index 49abf6df0..51ae317a4 100644 --- a/src/gen/filters/rules/citation/_regexpidof.py +++ b/src/gen/filters/rules/citation/_regexpidof.py @@ -26,14 +26,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._regexpidbase import RegExpIdBase +from .._regexpidbase import RegExpIdBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/event/__init__.py b/src/gen/filters/rules/event/__init__.py index 725cae120..fa8957803 100644 --- a/src/gen/filters/rules/event/__init__.py +++ b/src/gen/filters/rules/event/__init__.py @@ -26,7 +26,7 @@ Package providing filter rules for GRAMPS. """ -from gen.filters.rules._haseventbase import HasEventBase as HasEvent +from .._haseventbase import HasEventBase as HasEvent from _hastype import HasType from _allevents import AllEvents diff --git a/src/gen/filters/rules/event/_allevents.py b/src/gen/filters/rules/event/_allevents.py index b3e401b71..58a0e40e9 100644 --- a/src/gen/filters/rules/event/_allevents.py +++ b/src/gen/filters/rules/event/_allevents.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._everything import Everything +from .._everything import Everything #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/event/_changedsince.py b/src/gen/filters/rules/event/_changedsince.py index 062f05a28..bc4078a6c 100644 --- a/src/gen/filters/rules/event/_changedsince.py +++ b/src/gen/filters/rules/event/_changedsince.py @@ -26,14 +26,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._changedsincebase import ChangedSinceBase +from .._changedsincebase import ChangedSinceBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/event/_eventprivate.py b/src/gen/filters/rules/event/_eventprivate.py index 97883aeb9..72ceb556c 100644 --- a/src/gen/filters/rules/event/_eventprivate.py +++ b/src/gen/filters/rules/event/_eventprivate.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._isprivate import IsPrivate +from .._isprivate import IsPrivate #------------------------------------------------------------------------- # "Family marked private" diff --git a/src/gen/filters/rules/event/_hasattribute.py b/src/gen/filters/rules/event/_hasattribute.py index 636c0ecaf..386b9cc3a 100644 --- a/src/gen/filters/rules/event/_hasattribute.py +++ b/src/gen/filters/rules/event/_hasattribute.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hasattributebase import HasAttributeBase +from .._hasattributebase import HasAttributeBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/event/_hascitation.py b/src/gen/filters/rules/event/_hascitation.py index 02a23ce90..1ba1ace9b 100644 --- a/src/gen/filters/rules/event/_hascitation.py +++ b/src/gen/filters/rules/event/_hascitation.py @@ -29,14 +29,14 @@ Filter rule to match event with a particular citation. # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hascitationbase import HasCitationBase +from .._hascitationbase import HasCitationBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/event/_hasdata.py b/src/gen/filters/rules/event/_hasdata.py index 5024dbbab..cb5284de3 100644 --- a/src/gen/filters/rules/event/_hasdata.py +++ b/src/gen/filters/rules/event/_hasdata.py @@ -25,16 +25,16 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -import gen.datehandler -from gen.lib import EventType -from gen.filters.rules import Rule +from ....datehandler import parser +from ....lib.eventtype import EventType +from .. import Rule #------------------------------------------------------------------------- # @@ -63,7 +63,7 @@ class HasData(Rule): self.event_type.set_from_xml_str(self.list[0]) if self.date: - self.date = gen.datehandler.parser.parse(self.date) + self.date = parser.parse(self.date) def apply(self, db, event): if self.event_type and event.get_type() != self.event_type: diff --git a/src/gen/filters/rules/event/_hasgallery.py b/src/gen/filters/rules/event/_hasgallery.py index 5c53939da..3fe726cd7 100755 --- a/src/gen/filters/rules/event/_hasgallery.py +++ b/src/gen/filters/rules/event/_hasgallery.py @@ -28,14 +28,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hasgallerybase import HasGalleryBase +from .._hasgallerybase import HasGalleryBase #------------------------------------------------------------------------- # "Events who have media object reference" diff --git a/src/gen/filters/rules/event/_hasidof.py b/src/gen/filters/rules/event/_hasidof.py index f95a380bc..47a6f5562 100644 --- a/src/gen/filters/rules/event/_hasidof.py +++ b/src/gen/filters/rules/event/_hasidof.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import HasGrampsId +from .. import HasGrampsId #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/event/_hasnote.py b/src/gen/filters/rules/event/_hasnote.py index f746de4d7..2c5ebd5f2 100755 --- a/src/gen/filters/rules/event/_hasnote.py +++ b/src/gen/filters/rules/event/_hasnote.py @@ -28,14 +28,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hasnotebase import HasNoteBase +from .._hasnotebase import HasNoteBase #------------------------------------------------------------------------- # "Events having notes" diff --git a/src/gen/filters/rules/event/_hasnotematchingsubstringof.py b/src/gen/filters/rules/event/_hasnotematchingsubstringof.py index 390842a0b..ee41f4b33 100644 --- a/src/gen/filters/rules/event/_hasnotematchingsubstringof.py +++ b/src/gen/filters/rules/event/_hasnotematchingsubstringof.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hasnotesubstrbase import HasNoteSubstrBase +from .._hasnotesubstrbase import HasNoteSubstrBase #------------------------------------------------------------------------- # "Events having notes that contain a substring" diff --git a/src/gen/filters/rules/event/_hasnoteregexp.py b/src/gen/filters/rules/event/_hasnoteregexp.py index 5e0bc3146..498b6e125 100644 --- a/src/gen/filters/rules/event/_hasnoteregexp.py +++ b/src/gen/filters/rules/event/_hasnoteregexp.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hasnoteregexbase import HasNoteRegexBase +from .._hasnoteregexbase import HasNoteRegexBase #------------------------------------------------------------------------- # "Events having notes that contain a substring" diff --git a/src/gen/filters/rules/event/_hasreferencecountof.py b/src/gen/filters/rules/event/_hasreferencecountof.py index 7ec049db8..b4e006a5d 100644 --- a/src/gen/filters/rules/event/_hasreferencecountof.py +++ b/src/gen/filters/rules/event/_hasreferencecountof.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hasreferencecountbase import HasReferenceCountBase +from .._hasreferencecountbase import HasReferenceCountBase #------------------------------------------------------------------------- # "Events with a certain reference count" diff --git a/src/gen/filters/rules/event/_hassourcecount.py b/src/gen/filters/rules/event/_hassourcecount.py index e32ed90e0..a318b5716 100644 --- a/src/gen/filters/rules/event/_hassourcecount.py +++ b/src/gen/filters/rules/event/_hassourcecount.py @@ -27,14 +27,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hassourcecountbase import HasSourceCountBase +from .._hassourcecountbase import HasSourceCountBase #------------------------------------------------------------------------- # "People having sources" diff --git a/src/gen/filters/rules/event/_hastype.py b/src/gen/filters/rules/event/_hastype.py index 8ea806beb..625f603e2 100644 --- a/src/gen/filters/rules/event/_hastype.py +++ b/src/gen/filters/rules/event/_hastype.py @@ -25,15 +25,15 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib import EventType -from gen.filters.rules import Rule +from ....lib.eventtype import EventType +from .. import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/event/_matchesfilter.py b/src/gen/filters/rules/event/_matchesfilter.py index 21624689f..0ad712a08 100644 --- a/src/gen/filters/rules/event/_matchesfilter.py +++ b/src/gen/filters/rules/event/_matchesfilter.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import MatchesFilterBase +from .. import MatchesFilterBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/event/_matchespersonfilter.py b/src/gen/filters/rules/event/_matchespersonfilter.py index a7c329ea4..11ae8ae73 100644 --- a/src/gen/filters/rules/event/_matchespersonfilter.py +++ b/src/gen/filters/rules/event/_matchespersonfilter.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import MatchesFilterBase +from .. import MatchesFilterBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/event/_matchessourceconfidence.py b/src/gen/filters/rules/event/_matchessourceconfidence.py index 6cb7cbe9d..feae5830c 100644 --- a/src/gen/filters/rules/event/_matchessourceconfidence.py +++ b/src/gen/filters/rules/event/_matchessourceconfidence.py @@ -26,14 +26,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import sgettext as _ +from ....ggettext import sgettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._matchessourceconfidencebase import MatchesSourceConfidenceBase +from .._matchessourceconfidencebase import MatchesSourceConfidenceBase #------------------------------------------------------------------------- # "Confidence level" diff --git a/src/gen/filters/rules/event/_matchessourcefilter.py b/src/gen/filters/rules/event/_matchessourcefilter.py index c753cb78d..b802c4fa1 100644 --- a/src/gen/filters/rules/event/_matchessourcefilter.py +++ b/src/gen/filters/rules/event/_matchessourcefilter.py @@ -27,14 +27,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import MatchesSourceFilterBase +from .. import MatchesSourceFilterBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/event/_regexpidof.py b/src/gen/filters/rules/event/_regexpidof.py index 9a1e7a83d..9cbb1b97d 100644 --- a/src/gen/filters/rules/event/_regexpidof.py +++ b/src/gen/filters/rules/event/_regexpidof.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._regexpidbase import RegExpIdBase +from .._regexpidbase import RegExpIdBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/family/_allfamilies.py b/src/gen/filters/rules/family/_allfamilies.py index b401145be..d3bb04c11 100644 --- a/src/gen/filters/rules/family/_allfamilies.py +++ b/src/gen/filters/rules/family/_allfamilies.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._everything import Everything +from .._everything import Everything #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/family/_changedsince.py b/src/gen/filters/rules/family/_changedsince.py index c95ecefd1..f142c7d03 100644 --- a/src/gen/filters/rules/family/_changedsince.py +++ b/src/gen/filters/rules/family/_changedsince.py @@ -26,14 +26,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._changedsincebase import ChangedSinceBase +from .._changedsincebase import ChangedSinceBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/family/_childhasidof.py b/src/gen/filters/rules/family/_childhasidof.py index a2d3a3935..40395dfc3 100644 --- a/src/gen/filters/rules/family/_childhasidof.py +++ b/src/gen/filters/rules/family/_childhasidof.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import HasGrampsId +from .. import HasGrampsId from _memberbase import child_base #------------------------------------------------------------------------- diff --git a/src/gen/filters/rules/family/_childhasnameof.py b/src/gen/filters/rules/family/_childhasnameof.py index 911c46321..e59027fe7 100644 --- a/src/gen/filters/rules/family/_childhasnameof.py +++ b/src/gen/filters/rules/family/_childhasnameof.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules.person import HasNameOf +from ..person import HasNameOf from _memberbase import child_base #------------------------------------------------------------------------- diff --git a/src/gen/filters/rules/family/_familyprivate.py b/src/gen/filters/rules/family/_familyprivate.py index bf64a7a7c..7e77cb576 100644 --- a/src/gen/filters/rules/family/_familyprivate.py +++ b/src/gen/filters/rules/family/_familyprivate.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._isprivate import IsPrivate +from .._isprivate import IsPrivate #------------------------------------------------------------------------- # "Family marked private" diff --git a/src/gen/filters/rules/family/_fatherhasidof.py b/src/gen/filters/rules/family/_fatherhasidof.py index f38988c15..5d4211cfb 100644 --- a/src/gen/filters/rules/family/_fatherhasidof.py +++ b/src/gen/filters/rules/family/_fatherhasidof.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import HasGrampsId +from .. import HasGrampsId from _memberbase import father_base #------------------------------------------------------------------------- diff --git a/src/gen/filters/rules/family/_fatherhasnameof.py b/src/gen/filters/rules/family/_fatherhasnameof.py index 1bfab8973..3ca7cdfc0 100644 --- a/src/gen/filters/rules/family/_fatherhasnameof.py +++ b/src/gen/filters/rules/family/_fatherhasnameof.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules.person import HasNameOf +from ..person import HasNameOf from _memberbase import father_base #------------------------------------------------------------------------- diff --git a/src/gen/filters/rules/family/_hasattribute.py b/src/gen/filters/rules/family/_hasattribute.py index 7c742c391..91d672a24 100644 --- a/src/gen/filters/rules/family/_hasattribute.py +++ b/src/gen/filters/rules/family/_hasattribute.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hasattributebase import HasAttributeBase +from .._hasattributebase import HasAttributeBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/family/_hascitation.py b/src/gen/filters/rules/family/_hascitation.py index 9953b87e9..13af919b5 100644 --- a/src/gen/filters/rules/family/_hascitation.py +++ b/src/gen/filters/rules/family/_hascitation.py @@ -29,14 +29,14 @@ Filter rule to match family with a particular citation. # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hascitationbase import HasCitationBase +from .._hascitationbase import HasCitationBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/family/_hasevent.py b/src/gen/filters/rules/family/_hasevent.py index 7e3df0ed4..41cfb0ecb 100644 --- a/src/gen/filters/rules/family/_hasevent.py +++ b/src/gen/filters/rules/family/_hasevent.py @@ -28,14 +28,14 @@ Filter rule to match families with a particular event. # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._haseventbase import HasEventBase +from .._haseventbase import HasEventBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/family/_hasgallery.py b/src/gen/filters/rules/family/_hasgallery.py index 8fd3b1d51..f03d24f76 100755 --- a/src/gen/filters/rules/family/_hasgallery.py +++ b/src/gen/filters/rules/family/_hasgallery.py @@ -28,14 +28,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hasgallerybase import HasGalleryBase +from .._hasgallerybase import HasGalleryBase #------------------------------------------------------------------------- # "Families who have media object reference" diff --git a/src/gen/filters/rules/family/_hasidof.py b/src/gen/filters/rules/family/_hasidof.py index f147add98..78aaa5da6 100644 --- a/src/gen/filters/rules/family/_hasidof.py +++ b/src/gen/filters/rules/family/_hasidof.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import HasGrampsId +from .. import HasGrampsId #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/family/_haslds.py b/src/gen/filters/rules/family/_haslds.py index 1c7d52907..2be58a65a 100755 --- a/src/gen/filters/rules/family/_haslds.py +++ b/src/gen/filters/rules/family/_haslds.py @@ -28,7 +28,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # @@ -36,7 +36,7 @@ from gen.ggettext import gettext as _ # #------------------------------------------------------------------------- -from gen.filters.rules._hasldsbase import HasLDSBase +from .._hasldsbase import HasLDSBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/family/_hasnote.py b/src/gen/filters/rules/family/_hasnote.py index ec6976e7d..26a47da5a 100755 --- a/src/gen/filters/rules/family/_hasnote.py +++ b/src/gen/filters/rules/family/_hasnote.py @@ -28,14 +28,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hasnotebase import HasNoteBase +from .._hasnotebase import HasNoteBase #------------------------------------------------------------------------- # "Families having notes" diff --git a/src/gen/filters/rules/family/_hasnotematchingsubstringof.py b/src/gen/filters/rules/family/_hasnotematchingsubstringof.py index e4a09a03e..0b230a9e4 100644 --- a/src/gen/filters/rules/family/_hasnotematchingsubstringof.py +++ b/src/gen/filters/rules/family/_hasnotematchingsubstringof.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hasnotesubstrbase import HasNoteSubstrBase +from .._hasnotesubstrbase import HasNoteSubstrBase #------------------------------------------------------------------------- # "People having notes that contain a substring" diff --git a/src/gen/filters/rules/family/_hasnoteregexp.py b/src/gen/filters/rules/family/_hasnoteregexp.py index 4cc8d7c5f..6bf8635cd 100644 --- a/src/gen/filters/rules/family/_hasnoteregexp.py +++ b/src/gen/filters/rules/family/_hasnoteregexp.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hasnoteregexbase import HasNoteRegexBase +from .._hasnoteregexbase import HasNoteRegexBase #------------------------------------------------------------------------- # "People having notes that contain a substring" diff --git a/src/gen/filters/rules/family/_hasreferencecountof.py b/src/gen/filters/rules/family/_hasreferencecountof.py index fc6ff887a..c604ce8f4 100644 --- a/src/gen/filters/rules/family/_hasreferencecountof.py +++ b/src/gen/filters/rules/family/_hasreferencecountof.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hasreferencecountbase import HasReferenceCountBase +from .._hasreferencecountbase import HasReferenceCountBase #------------------------------------------------------------------------- # "Family objects with a certain reference count" diff --git a/src/gen/filters/rules/family/_hasreltype.py b/src/gen/filters/rules/family/_hasreltype.py index 3d0445fd1..78f3557f9 100644 --- a/src/gen/filters/rules/family/_hasreltype.py +++ b/src/gen/filters/rules/family/_hasreltype.py @@ -25,15 +25,15 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib import FamilyRelType -from gen.filters.rules import Rule +from ....lib.familyreltype import FamilyRelType +from .. import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/family/_hassourcecount.py b/src/gen/filters/rules/family/_hassourcecount.py index ff38721a2..0db41ee83 100755 --- a/src/gen/filters/rules/family/_hassourcecount.py +++ b/src/gen/filters/rules/family/_hassourcecount.py @@ -28,14 +28,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hassourcecountbase import HasSourceCountBase +from .._hassourcecountbase import HasSourceCountBase #------------------------------------------------------------------------- # "Families having sources" diff --git a/src/gen/filters/rules/family/_hassourceof.py b/src/gen/filters/rules/family/_hassourceof.py index a117e57ba..766b4d2ff 100644 --- a/src/gen/filters/rules/family/_hassourceof.py +++ b/src/gen/filters/rules/family/_hassourceof.py @@ -26,14 +26,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hassourceofbase import HasSourceOfBase +from .._hassourceofbase import HasSourceOfBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/family/_hastag.py b/src/gen/filters/rules/family/_hastag.py index 7d83baab0..78f6fb735 100644 --- a/src/gen/filters/rules/family/_hastag.py +++ b/src/gen/filters/rules/family/_hastag.py @@ -27,14 +27,14 @@ Rule that checks for a family with a particular tag. # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hastagbase import HasTagBase +from .._hastagbase import HasTagBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/family/_isbookmarked.py b/src/gen/filters/rules/family/_isbookmarked.py index 121f331e8..37cf00ae4 100644 --- a/src/gen/filters/rules/family/_isbookmarked.py +++ b/src/gen/filters/rules/family/_isbookmarked.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from .. import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/family/_matchesfilter.py b/src/gen/filters/rules/family/_matchesfilter.py index 83334b36d..7b412cd38 100644 --- a/src/gen/filters/rules/family/_matchesfilter.py +++ b/src/gen/filters/rules/family/_matchesfilter.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import MatchesFilterBase +from .. import MatchesFilterBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/family/_matchessourceconfidence.py b/src/gen/filters/rules/family/_matchessourceconfidence.py index 86375bb4e..f2e7fc74b 100644 --- a/src/gen/filters/rules/family/_matchessourceconfidence.py +++ b/src/gen/filters/rules/family/_matchessourceconfidence.py @@ -26,14 +26,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import sgettext as _ +from ....ggettext import sgettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._matchessourceconfidencebase import MatchesSourceConfidenceBase +from .._matchessourceconfidencebase import MatchesSourceConfidenceBase #------------------------------------------------------------------------- # "Confidence level" diff --git a/src/gen/filters/rules/family/_motherhasidof.py b/src/gen/filters/rules/family/_motherhasidof.py index d38fc32cf..e421c8b87 100644 --- a/src/gen/filters/rules/family/_motherhasidof.py +++ b/src/gen/filters/rules/family/_motherhasidof.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import HasGrampsId +from .. import HasGrampsId from _memberbase import mother_base #------------------------------------------------------------------------- diff --git a/src/gen/filters/rules/family/_motherhasnameof.py b/src/gen/filters/rules/family/_motherhasnameof.py index a6008e96f..00f7370fb 100644 --- a/src/gen/filters/rules/family/_motherhasnameof.py +++ b/src/gen/filters/rules/family/_motherhasnameof.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules.person import HasNameOf +from ..person import HasNameOf from _memberbase import mother_base #------------------------------------------------------------------------- diff --git a/src/gen/filters/rules/family/_regexpchildname.py b/src/gen/filters/rules/family/_regexpchildname.py index 6477e9782..cc0958774 100644 --- a/src/gen/filters/rules/family/_regexpchildname.py +++ b/src/gen/filters/rules/family/_regexpchildname.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules.person import RegExpName +from ..person import RegExpName from _memberbase import child_base #------------------------------------------------------------------------- diff --git a/src/gen/filters/rules/family/_regexpfathername.py b/src/gen/filters/rules/family/_regexpfathername.py index 6fdf54d14..91aa15e22 100644 --- a/src/gen/filters/rules/family/_regexpfathername.py +++ b/src/gen/filters/rules/family/_regexpfathername.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules.person import RegExpName +from ..person import RegExpName from _memberbase import father_base #------------------------------------------------------------------------- diff --git a/src/gen/filters/rules/family/_regexpidof.py b/src/gen/filters/rules/family/_regexpidof.py index 9cefe8b11..dfc7f6252 100644 --- a/src/gen/filters/rules/family/_regexpidof.py +++ b/src/gen/filters/rules/family/_regexpidof.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._regexpidbase import RegExpIdBase +from .._regexpidbase import RegExpIdBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/family/_regexpmothername.py b/src/gen/filters/rules/family/_regexpmothername.py index d5ecaf0c3..40e33c785 100644 --- a/src/gen/filters/rules/family/_regexpmothername.py +++ b/src/gen/filters/rules/family/_regexpmothername.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules.person import RegExpName +from ..person import RegExpName from _memberbase import mother_base #------------------------------------------------------------------------- diff --git a/src/gen/filters/rules/family/_searchchildname.py b/src/gen/filters/rules/family/_searchchildname.py index 32737289c..5ab96260c 100644 --- a/src/gen/filters/rules/family/_searchchildname.py +++ b/src/gen/filters/rules/family/_searchchildname.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules.person import SearchName +from ..person import SearchName from _memberbase import child_base #------------------------------------------------------------------------- diff --git a/src/gen/filters/rules/family/_searchfathername.py b/src/gen/filters/rules/family/_searchfathername.py index bde339d9a..99dac1379 100644 --- a/src/gen/filters/rules/family/_searchfathername.py +++ b/src/gen/filters/rules/family/_searchfathername.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules.person import SearchName +from ..person import SearchName from _memberbase import father_base #------------------------------------------------------------------------- diff --git a/src/gen/filters/rules/family/_searchmothername.py b/src/gen/filters/rules/family/_searchmothername.py index b86a8fc08..62869af4a 100644 --- a/src/gen/filters/rules/family/_searchmothername.py +++ b/src/gen/filters/rules/family/_searchmothername.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules.person import SearchName +from ..person import SearchName from _memberbase import mother_base #------------------------------------------------------------------------- diff --git a/src/gen/filters/rules/media/_allmedia.py b/src/gen/filters/rules/media/_allmedia.py index 450a1eb8c..8a4db8157 100644 --- a/src/gen/filters/rules/media/_allmedia.py +++ b/src/gen/filters/rules/media/_allmedia.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._everything import Everything +from .._everything import Everything #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/media/_changedsince.py b/src/gen/filters/rules/media/_changedsince.py index 804cd5aa4..20802c907 100644 --- a/src/gen/filters/rules/media/_changedsince.py +++ b/src/gen/filters/rules/media/_changedsince.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._changedsincebase import ChangedSinceBase +from .._changedsincebase import ChangedSinceBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/media/_hasattribute.py b/src/gen/filters/rules/media/_hasattribute.py index be5aa4103..cc13ead0f 100644 --- a/src/gen/filters/rules/media/_hasattribute.py +++ b/src/gen/filters/rules/media/_hasattribute.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hasattributebase import HasAttributeBase +from .._hasattributebase import HasAttributeBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/media/_hascitation.py b/src/gen/filters/rules/media/_hascitation.py index 01a546169..dc6c5361a 100644 --- a/src/gen/filters/rules/media/_hascitation.py +++ b/src/gen/filters/rules/media/_hascitation.py @@ -28,14 +28,14 @@ Filter rule to match persons with a particular citation. # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hascitationbase import HasCitationBase +from .._hascitationbase import HasCitationBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/media/_hasidof.py b/src/gen/filters/rules/media/_hasidof.py index cec978ff0..9315b59fc 100644 --- a/src/gen/filters/rules/media/_hasidof.py +++ b/src/gen/filters/rules/media/_hasidof.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import HasGrampsId +from .. import HasGrampsId #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/media/_hasmedia.py b/src/gen/filters/rules/media/_hasmedia.py index e64c05489..4fad9a894 100644 --- a/src/gen/filters/rules/media/_hasmedia.py +++ b/src/gen/filters/rules/media/_hasmedia.py @@ -25,15 +25,15 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -import gen.datehandler -from gen.filters.rules import Rule +from ....datehandler import parser +from .. import Rule #------------------------------------------------------------------------- # @@ -57,7 +57,7 @@ class HasMedia(Rule): self.date = None try: if self.list[3]: - self.date = gen.datehandler.parser.parse(self.list[3]) + self.date = parser.parse(self.list[3]) except: pass diff --git a/src/gen/filters/rules/media/_hasnotematchingsubstringof.py b/src/gen/filters/rules/media/_hasnotematchingsubstringof.py index c04b49fb9..c3ce4138e 100644 --- a/src/gen/filters/rules/media/_hasnotematchingsubstringof.py +++ b/src/gen/filters/rules/media/_hasnotematchingsubstringof.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hasnotesubstrbase import HasNoteSubstrBase +from .._hasnotesubstrbase import HasNoteSubstrBase #------------------------------------------------------------------------- # "Media having notes that contain a substring" diff --git a/src/gen/filters/rules/media/_hasnoteregexp.py b/src/gen/filters/rules/media/_hasnoteregexp.py index f82f64318..f2ad8e1ad 100644 --- a/src/gen/filters/rules/media/_hasnoteregexp.py +++ b/src/gen/filters/rules/media/_hasnoteregexp.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hasnoteregexbase import HasNoteRegexBase +from .._hasnoteregexbase import HasNoteRegexBase #------------------------------------------------------------------------- # "Media having notes that contain a substring" diff --git a/src/gen/filters/rules/media/_hasreferencecountof.py b/src/gen/filters/rules/media/_hasreferencecountof.py index 8cfa84091..931905f0f 100644 --- a/src/gen/filters/rules/media/_hasreferencecountof.py +++ b/src/gen/filters/rules/media/_hasreferencecountof.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hasreferencecountbase import HasReferenceCountBase +from .._hasreferencecountbase import HasReferenceCountBase #------------------------------------------------------------------------- # "Media objects with a certain reference count" diff --git a/src/gen/filters/rules/media/_hassourcecount.py b/src/gen/filters/rules/media/_hassourcecount.py index 94a86a24e..7e6b2b6ac 100644 --- a/src/gen/filters/rules/media/_hassourcecount.py +++ b/src/gen/filters/rules/media/_hassourcecount.py @@ -28,14 +28,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hassourcecountbase import HasSourceCountBase +from .._hassourcecountbase import HasSourceCountBase #------------------------------------------------------------------------- # "People having sources" diff --git a/src/gen/filters/rules/media/_hassourceof.py b/src/gen/filters/rules/media/_hassourceof.py index 16b3fc642..d344a7377 100644 --- a/src/gen/filters/rules/media/_hassourceof.py +++ b/src/gen/filters/rules/media/_hassourceof.py @@ -26,14 +26,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hassourceofbase import HasSourceOfBase +from .._hassourceofbase import HasSourceOfBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/media/_hastag.py b/src/gen/filters/rules/media/_hastag.py index b94b46e6b..6782ce428 100644 --- a/src/gen/filters/rules/media/_hastag.py +++ b/src/gen/filters/rules/media/_hastag.py @@ -27,14 +27,14 @@ Rule that checks for a media object with a particular tag. # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hastagbase import HasTagBase +from .._hastagbase import HasTagBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/media/_matchesfilter.py b/src/gen/filters/rules/media/_matchesfilter.py index 5b6eeb578..943ef9400 100644 --- a/src/gen/filters/rules/media/_matchesfilter.py +++ b/src/gen/filters/rules/media/_matchesfilter.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import MatchesFilterBase +from .. import MatchesFilterBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/media/_matchessourceconfidence.py b/src/gen/filters/rules/media/_matchessourceconfidence.py index 7b6851ce5..8925b85b4 100644 --- a/src/gen/filters/rules/media/_matchessourceconfidence.py +++ b/src/gen/filters/rules/media/_matchessourceconfidence.py @@ -26,14 +26,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import sgettext as _ +from ....ggettext import sgettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._matchessourceconfidencebase import MatchesSourceConfidenceBase +from .._matchessourceconfidencebase import MatchesSourceConfidenceBase #------------------------------------------------------------------------- # "Confidence level" diff --git a/src/gen/filters/rules/media/_mediaprivate.py b/src/gen/filters/rules/media/_mediaprivate.py index c81f396b3..8e28537d7 100644 --- a/src/gen/filters/rules/media/_mediaprivate.py +++ b/src/gen/filters/rules/media/_mediaprivate.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._isprivate import IsPrivate +from .._isprivate import IsPrivate #------------------------------------------------------------------------- # "Media marked private" diff --git a/src/gen/filters/rules/media/_regexpidof.py b/src/gen/filters/rules/media/_regexpidof.py index 5adc78e4a..e857b046e 100644 --- a/src/gen/filters/rules/media/_regexpidof.py +++ b/src/gen/filters/rules/media/_regexpidof.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._regexpidbase import RegExpIdBase +from .._regexpidbase import RegExpIdBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/note/_allnotes.py b/src/gen/filters/rules/note/_allnotes.py index e3ff3b5f3..7c28fd1b6 100644 --- a/src/gen/filters/rules/note/_allnotes.py +++ b/src/gen/filters/rules/note/_allnotes.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._everything import Everything +from .._everything import Everything #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/note/_changedsince.py b/src/gen/filters/rules/note/_changedsince.py index 55e0e5d64..7d4321e4b 100644 --- a/src/gen/filters/rules/note/_changedsince.py +++ b/src/gen/filters/rules/note/_changedsince.py @@ -26,14 +26,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._changedsincebase import ChangedSinceBase +from .._changedsincebase import ChangedSinceBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/note/_hasidof.py b/src/gen/filters/rules/note/_hasidof.py index cd8f84925..3cc7ed815 100644 --- a/src/gen/filters/rules/note/_hasidof.py +++ b/src/gen/filters/rules/note/_hasidof.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import HasGrampsId +from .. import HasGrampsId #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/note/_hasnote.py b/src/gen/filters/rules/note/_hasnote.py index 9c2614628..3a9011d8f 100644 --- a/src/gen/filters/rules/note/_hasnote.py +++ b/src/gen/filters/rules/note/_hasnote.py @@ -25,15 +25,15 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib import NoteType -from gen.filters.rules import Rule +from ....lib.notetype import NoteType +from .. import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/note/_hasreferencecountof.py b/src/gen/filters/rules/note/_hasreferencecountof.py index c332acca2..0bb82bca7 100644 --- a/src/gen/filters/rules/note/_hasreferencecountof.py +++ b/src/gen/filters/rules/note/_hasreferencecountof.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hasreferencecountbase import HasReferenceCountBase +from .._hasreferencecountbase import HasReferenceCountBase #------------------------------------------------------------------------- # "Notes with a certain reference count" diff --git a/src/gen/filters/rules/note/_hastag.py b/src/gen/filters/rules/note/_hastag.py index 9499e924e..e0ec1f2a2 100644 --- a/src/gen/filters/rules/note/_hastag.py +++ b/src/gen/filters/rules/note/_hastag.py @@ -27,14 +27,14 @@ Rule that checks for a note with a particular tag. # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hastagbase import HasTagBase +from .._hastagbase import HasTagBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/note/_matchesfilter.py b/src/gen/filters/rules/note/_matchesfilter.py index 9ff4e7101..b415b273a 100644 --- a/src/gen/filters/rules/note/_matchesfilter.py +++ b/src/gen/filters/rules/note/_matchesfilter.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import MatchesFilterBase +from .. import MatchesFilterBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/note/_matchesregexpof.py b/src/gen/filters/rules/note/_matchesregexpof.py index 216a082a9..af564ab16 100644 --- a/src/gen/filters/rules/note/_matchesregexpof.py +++ b/src/gen/filters/rules/note/_matchesregexpof.py @@ -27,14 +27,14 @@ # #------------------------------------------------------------------------- import re -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from .. import Rule #------------------------------------------------------------------------- # "Repos having notes that contain a substring" diff --git a/src/gen/filters/rules/note/_matchessubstringof.py b/src/gen/filters/rules/note/_matchessubstringof.py index 61ac7619b..0aef3d1e6 100644 --- a/src/gen/filters/rules/note/_matchessubstringof.py +++ b/src/gen/filters/rules/note/_matchessubstringof.py @@ -26,14 +26,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from .. import Rule #------------------------------------------------------------------------- # "Events having notes that contain a substring" diff --git a/src/gen/filters/rules/note/_noteprivate.py b/src/gen/filters/rules/note/_noteprivate.py index 336899f85..de77b35fa 100644 --- a/src/gen/filters/rules/note/_noteprivate.py +++ b/src/gen/filters/rules/note/_noteprivate.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._isprivate import IsPrivate +from .._isprivate import IsPrivate #------------------------------------------------------------------------- # "Repo marked private" diff --git a/src/gen/filters/rules/note/_regexpidof.py b/src/gen/filters/rules/note/_regexpidof.py index ef7789c9c..f8c2d5630 100644 --- a/src/gen/filters/rules/note/_regexpidof.py +++ b/src/gen/filters/rules/note/_regexpidof.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._regexpidbase import RegExpIdBase +from .._regexpidbase import RegExpIdBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_changedsince.py b/src/gen/filters/rules/person/_changedsince.py index 1fa2948c3..b811e9c47 100644 --- a/src/gen/filters/rules/person/_changedsince.py +++ b/src/gen/filters/rules/person/_changedsince.py @@ -26,14 +26,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._changedsincebase import ChangedSinceBase +from .._changedsincebase import ChangedSinceBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_deeprelationshippathbetween.py b/src/gen/filters/rules/person/_deeprelationshippathbetween.py index 6ec8aa031..95c0a984b 100644 --- a/src/gen/filters/rules/person/_deeprelationshippathbetween.py +++ b/src/gen/filters/rules/person/_deeprelationshippathbetween.py @@ -26,16 +26,16 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gui.utils import ProgressMeter -from gen.filters.rules import Rule -from gen.filters.rules.person import MatchesFilter +from gramps.gui.utils import ProgressMeter +from .. import Rule +from . import MatchesFilter #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_disconnected.py b/src/gen/filters/rules/person/_disconnected.py index 04cca789a..55363fc00 100644 --- a/src/gen/filters/rules/person/_disconnected.py +++ b/src/gen/filters/rules/person/_disconnected.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from .. import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_everyone.py b/src/gen/filters/rules/person/_everyone.py index 42e70ee1e..d199c8e38 100644 --- a/src/gen/filters/rules/person/_everyone.py +++ b/src/gen/filters/rules/person/_everyone.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from .. import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_familywithincompleteevent.py b/src/gen/filters/rules/person/_familywithincompleteevent.py index 9c15d304d..d7da77b21 100644 --- a/src/gen/filters/rules/person/_familywithincompleteevent.py +++ b/src/gen/filters/rules/person/_familywithincompleteevent.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from .. import Rule #------------------------------------------------------------------------- # "Families with incomplete events" diff --git a/src/gen/filters/rules/person/_hasaddress.py b/src/gen/filters/rules/person/_hasaddress.py index 2412359c3..ba2719c9b 100755 --- a/src/gen/filters/rules/person/_hasaddress.py +++ b/src/gen/filters/rules/person/_hasaddress.py @@ -28,7 +28,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # @@ -36,7 +36,7 @@ from gen.ggettext import gettext as _ # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from .. import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_hasalternatename.py b/src/gen/filters/rules/person/_hasalternatename.py index e7cadf583..8b528bc2c 100644 --- a/src/gen/filters/rules/person/_hasalternatename.py +++ b/src/gen/filters/rules/person/_hasalternatename.py @@ -26,14 +26,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from .. import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_hasassociation.py b/src/gen/filters/rules/person/_hasassociation.py index 996bae0b1..3689353e2 100755 --- a/src/gen/filters/rules/person/_hasassociation.py +++ b/src/gen/filters/rules/person/_hasassociation.py @@ -28,7 +28,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # @@ -36,7 +36,7 @@ from gen.ggettext import gettext as _ # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from .. import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_hasattribute.py b/src/gen/filters/rules/person/_hasattribute.py index eee1e3744..56fa0323b 100644 --- a/src/gen/filters/rules/person/_hasattribute.py +++ b/src/gen/filters/rules/person/_hasattribute.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hasattributebase import HasAttributeBase +from .._hasattributebase import HasAttributeBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_hasbirth.py b/src/gen/filters/rules/person/_hasbirth.py index c45e9a4b4..a7626f7d5 100644 --- a/src/gen/filters/rules/person/_hasbirth.py +++ b/src/gen/filters/rules/person/_hasbirth.py @@ -25,16 +25,17 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -import gen.datehandler -from gen.lib import EventType,EventRoleType -from gen.filters.rules import Rule +from ....datehandler import parser +from ....lib.eventtype import EventType +from ....lib.eventroletype import EventRoleType +from .. import Rule #------------------------------------------------------------------------- # @@ -52,7 +53,7 @@ class HasBirth(Rule): def __init__(self,list): Rule.__init__(self,list) if self.list[0]: - self.date = gen.datehandler.parser.parse(self.list[0]) + self.date = parser.parse(self.list[0]) else: self.date = None diff --git a/src/gen/filters/rules/person/_hascitation.py b/src/gen/filters/rules/person/_hascitation.py index 1531de14b..444bcce7b 100644 --- a/src/gen/filters/rules/person/_hascitation.py +++ b/src/gen/filters/rules/person/_hascitation.py @@ -28,14 +28,14 @@ Filter rule to match persons with a particular citation. # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hascitationbase import HasCitationBase +from .._hascitationbase import HasCitationBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_hascommonancestorwith.py b/src/gen/filters/rules/person/_hascommonancestorwith.py index b92bc201a..05a8a2026 100644 --- a/src/gen/filters/rules/person/_hascommonancestorwith.py +++ b/src/gen/filters/rules/person/_hascommonancestorwith.py @@ -25,15 +25,15 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.utils.db import for_each_ancestor -from gen.filters.rules import Rule +from ....utils.db import for_each_ancestor +from .. import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_hascommonancestorwithfiltermatch.py b/src/gen/filters/rules/person/_hascommonancestorwithfiltermatch.py index 93ea47bcb..ea31dc948 100644 --- a/src/gen/filters/rules/person/_hascommonancestorwithfiltermatch.py +++ b/src/gen/filters/rules/person/_hascommonancestorwithfiltermatch.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.utils.db import for_each_ancestor +from ....utils.db import for_each_ancestor from _hascommonancestorwith import HasCommonAncestorWith from _matchesfilter import MatchesFilter diff --git a/src/gen/filters/rules/person/_hasdeath.py b/src/gen/filters/rules/person/_hasdeath.py index dad28b4fb..091f466dc 100644 --- a/src/gen/filters/rules/person/_hasdeath.py +++ b/src/gen/filters/rules/person/_hasdeath.py @@ -25,16 +25,17 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -import gen.datehandler -from gen.lib import EventType,EventRoleType -from gen.filters.rules import Rule +from ....datehandler import parser +from ....lib.eventroletype import EventRoleType +from ....lib.eventtype import EventType +from .. import Rule #------------------------------------------------------------------------- # @@ -52,7 +53,7 @@ class HasDeath(Rule): def __init__(self,list): Rule.__init__(self,list) if self.list[0]: - self.date = gen.datehandler.parser.parse(self.list[0]) + self.date = parser.parse(self.list[0]) else: self.date = None diff --git a/src/gen/filters/rules/person/_hasevent.py b/src/gen/filters/rules/person/_hasevent.py index dc3334944..6444bd233 100644 --- a/src/gen/filters/rules/person/_hasevent.py +++ b/src/gen/filters/rules/person/_hasevent.py @@ -28,15 +28,15 @@ Filter rule to match persons with a particular event. # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib import EventRoleType -from gen.filters.rules._haseventbase import HasEventBase +from ....lib.eventroletype import EventRoleType +from .._haseventbase import HasEventBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_hasfamilyattribute.py b/src/gen/filters/rules/person/_hasfamilyattribute.py index ed7b695e4..c0d34b5eb 100644 --- a/src/gen/filters/rules/person/_hasfamilyattribute.py +++ b/src/gen/filters/rules/person/_hasfamilyattribute.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from .. import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_hasfamilyevent.py b/src/gen/filters/rules/person/_hasfamilyevent.py index 2763b2af5..0985993ad 100644 --- a/src/gen/filters/rules/person/_hasfamilyevent.py +++ b/src/gen/filters/rules/person/_hasfamilyevent.py @@ -25,16 +25,16 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -import gen.datehandler -from gen.lib import EventType -from gen.filters.rules import Rule +from ....datehandler import parser +from ....lib.eventtype import EventType +from .. import Rule #------------------------------------------------------------------------- # @@ -57,7 +57,7 @@ class HasFamilyEvent(Rule): self.date = None try: if self.list[1]: - self.date = gen.datehandler.parser.parse(self.list[1]) + self.date = parser.parse(self.list[1]) except: pass diff --git a/src/gen/filters/rules/person/_hasgallery.py b/src/gen/filters/rules/person/_hasgallery.py index 8ac044178..ba309903f 100644 --- a/src/gen/filters/rules/person/_hasgallery.py +++ b/src/gen/filters/rules/person/_hasgallery.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hasgallerybase import HasGalleryBase +from .._hasgallerybase import HasGalleryBase #------------------------------------------------------------------------- # "People with media object reference " diff --git a/src/gen/filters/rules/person/_hasidof.py b/src/gen/filters/rules/person/_hasidof.py index 900f6d60c..9350b354b 100644 --- a/src/gen/filters/rules/person/_hasidof.py +++ b/src/gen/filters/rules/person/_hasidof.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import HasGrampsId +from .. import HasGrampsId #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_haslds.py b/src/gen/filters/rules/person/_haslds.py index 22c15e4a7..05575f150 100755 --- a/src/gen/filters/rules/person/_haslds.py +++ b/src/gen/filters/rules/person/_haslds.py @@ -28,7 +28,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # @@ -36,7 +36,7 @@ from gen.ggettext import gettext as _ # #------------------------------------------------------------------------- -from gen.filters.rules._hasldsbase import HasLDSBase +from .._hasldsbase import HasLDSBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_hasnameof.py b/src/gen/filters/rules/person/_hasnameof.py index 22cad0d7b..681e3cf71 100644 --- a/src/gen/filters/rules/person/_hasnameof.py +++ b/src/gen/filters/rules/person/_hasnameof.py @@ -26,7 +26,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import sgettext as _ +from ....ggettext import sgettext as _ import re #------------------------------------------------------------------------- @@ -34,8 +34,8 @@ import re # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule -from gen.lib import NameOriginType +from .. import Rule +from ....lib.nameorigintype import NameOriginType #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_hasnameorigintype.py b/src/gen/filters/rules/person/_hasnameorigintype.py index 02c57cc7f..ff2760981 100644 --- a/src/gen/filters/rules/person/_hasnameorigintype.py +++ b/src/gen/filters/rules/person/_hasnameorigintype.py @@ -26,15 +26,15 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule -from gen.lib import NameOriginType +from .. import Rule +from ....lib.nameorigintype import NameOriginType #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_hasnametype.py b/src/gen/filters/rules/person/_hasnametype.py index ee5f7f5f2..8f863e40b 100644 --- a/src/gen/filters/rules/person/_hasnametype.py +++ b/src/gen/filters/rules/person/_hasnametype.py @@ -26,15 +26,15 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule -from gen.lib import NameType +from .. import Rule +from ....lib.nametype import NameType #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_hasnickname.py b/src/gen/filters/rules/person/_hasnickname.py index fc8514145..33c69d945 100644 --- a/src/gen/filters/rules/person/_hasnickname.py +++ b/src/gen/filters/rules/person/_hasnickname.py @@ -26,14 +26,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from .. import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_hasnote.py b/src/gen/filters/rules/person/_hasnote.py index b64c2a715..cfac1b00a 100644 --- a/src/gen/filters/rules/person/_hasnote.py +++ b/src/gen/filters/rules/person/_hasnote.py @@ -28,14 +28,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hasnotebase import HasNoteBase +from .._hasnotebase import HasNoteBase #------------------------------------------------------------------------- # "People having notes" diff --git a/src/gen/filters/rules/person/_hasnotematchingsubstringof.py b/src/gen/filters/rules/person/_hasnotematchingsubstringof.py index 5aa24a79c..94f5cf303 100644 --- a/src/gen/filters/rules/person/_hasnotematchingsubstringof.py +++ b/src/gen/filters/rules/person/_hasnotematchingsubstringof.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hasnotesubstrbase import HasNoteSubstrBase +from .._hasnotesubstrbase import HasNoteSubstrBase #------------------------------------------------------------------------- # "People having notes that contain a substring" diff --git a/src/gen/filters/rules/person/_hasnoteregexp.py b/src/gen/filters/rules/person/_hasnoteregexp.py index fe6ea9ca1..ae0296de9 100644 --- a/src/gen/filters/rules/person/_hasnoteregexp.py +++ b/src/gen/filters/rules/person/_hasnoteregexp.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hasnoteregexbase import HasNoteRegexBase +from .._hasnoteregexbase import HasNoteRegexBase #------------------------------------------------------------------------- # "People having notes that contain a substring" diff --git a/src/gen/filters/rules/person/_hasrelationship.py b/src/gen/filters/rules/person/_hasrelationship.py index 4b960497d..6ecaf9797 100644 --- a/src/gen/filters/rules/person/_hasrelationship.py +++ b/src/gen/filters/rules/person/_hasrelationship.py @@ -25,15 +25,15 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule -from gen.lib import FamilyRelType +from .. import Rule +from ....lib.familyreltype import FamilyRelType #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_hassourcecount.py b/src/gen/filters/rules/person/_hassourcecount.py index 346bcb5bc..8cded5cde 100755 --- a/src/gen/filters/rules/person/_hassourcecount.py +++ b/src/gen/filters/rules/person/_hassourcecount.py @@ -28,14 +28,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hassourcecountbase import HasSourceCountBase +from .._hassourcecountbase import HasSourceCountBase #------------------------------------------------------------------------- # "People having sources" diff --git a/src/gen/filters/rules/person/_hassourceof.py b/src/gen/filters/rules/person/_hassourceof.py index 0023444c1..a91f13115 100644 --- a/src/gen/filters/rules/person/_hassourceof.py +++ b/src/gen/filters/rules/person/_hassourceof.py @@ -26,14 +26,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hassourceofbase import HasSourceOfBase +from .._hassourceofbase import HasSourceOfBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_hastag.py b/src/gen/filters/rules/person/_hastag.py index 36a3a3cd8..9bf56e888 100644 --- a/src/gen/filters/rules/person/_hastag.py +++ b/src/gen/filters/rules/person/_hastag.py @@ -27,14 +27,14 @@ Rule that checks for a person with a particular tag. # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hastagbase import HasTagBase +from .._hastagbase import HasTagBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_hastextmatchingsubstringof.py b/src/gen/filters/rules/person/_hastextmatchingsubstringof.py index b2ef735e6..b4077cf93 100644 --- a/src/gen/filters/rules/person/_hastextmatchingsubstringof.py +++ b/src/gen/filters/rules/person/_hastextmatchingsubstringof.py @@ -26,7 +26,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ import logging LOG = logging.getLogger(".citationfilter") @@ -35,8 +35,8 @@ LOG = logging.getLogger(".citationfilter") # GRAMPS modules # #------------------------------------------------------------------------- -from gen.utils.db import get_source_and_citation_referents -from gen.filters.rules import Rule +from ....utils.db import get_source_and_citation_referents +from .. import Rule #------------------------------------------------------------------------- # "HasTextMatchingSubstringOf" diff --git a/src/gen/filters/rules/person/_hasunknowngender.py b/src/gen/filters/rules/person/_hasunknowngender.py index decd37437..818ad3df5 100644 --- a/src/gen/filters/rules/person/_hasunknowngender.py +++ b/src/gen/filters/rules/person/_hasunknowngender.py @@ -25,15 +25,15 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule -from gen.lib import Person +from .. import Rule +from ....lib.person import Person #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_havealtfamilies.py b/src/gen/filters/rules/person/_havealtfamilies.py index cc7047bb2..fcfdcbd93 100644 --- a/src/gen/filters/rules/person/_havealtfamilies.py +++ b/src/gen/filters/rules/person/_havealtfamilies.py @@ -25,15 +25,15 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule -from gen.lib import ChildRefType +from .. import Rule +from ....lib.childreftype import ChildRefType #------------------------------------------------------------------------- # "People who were adopted" diff --git a/src/gen/filters/rules/person/_havechildren.py b/src/gen/filters/rules/person/_havechildren.py index 22d0de781..be012a140 100644 --- a/src/gen/filters/rules/person/_havechildren.py +++ b/src/gen/filters/rules/person/_havechildren.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from .. import Rule #------------------------------------------------------------------------- # "People with children" diff --git a/src/gen/filters/rules/person/_incompletenames.py b/src/gen/filters/rules/person/_incompletenames.py index 4b07b26ec..6590aad0b 100644 --- a/src/gen/filters/rules/person/_incompletenames.py +++ b/src/gen/filters/rules/person/_incompletenames.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from .. import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_isancestorof.py b/src/gen/filters/rules/person/_isancestorof.py index 3b2e0756b..331f4fa11 100644 --- a/src/gen/filters/rules/person/_isancestorof.py +++ b/src/gen/filters/rules/person/_isancestorof.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from .. import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_isancestoroffiltermatch.py b/src/gen/filters/rules/person/_isancestoroffiltermatch.py index b93e8f371..0b6112c58 100644 --- a/src/gen/filters/rules/person/_isancestoroffiltermatch.py +++ b/src/gen/filters/rules/person/_isancestoroffiltermatch.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_isbookmarked.py b/src/gen/filters/rules/person/_isbookmarked.py index b3d604ab0..0836ba4f1 100644 --- a/src/gen/filters/rules/person/_isbookmarked.py +++ b/src/gen/filters/rules/person/_isbookmarked.py @@ -26,14 +26,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from .. import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_ischildoffiltermatch.py b/src/gen/filters/rules/person/_ischildoffiltermatch.py index 21a3b13dd..f77fd072b 100644 --- a/src/gen/filters/rules/person/_ischildoffiltermatch.py +++ b/src/gen/filters/rules/person/_ischildoffiltermatch.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from .. import Rule from _matchesfilter import MatchesFilter #------------------------------------------------------------------------- diff --git a/src/gen/filters/rules/person/_isdefaultperson.py b/src/gen/filters/rules/person/_isdefaultperson.py index d24d53c90..e2e4d1d46 100644 --- a/src/gen/filters/rules/person/_isdefaultperson.py +++ b/src/gen/filters/rules/person/_isdefaultperson.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from .. import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_isdescendantfamilyof.py b/src/gen/filters/rules/person/_isdescendantfamilyof.py index fd7308d1c..ecff7deb9 100644 --- a/src/gen/filters/rules/person/_isdescendantfamilyof.py +++ b/src/gen/filters/rules/person/_isdescendantfamilyof.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ try: set() except NameError: @@ -36,7 +36,7 @@ except NameError: # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from .. import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_isdescendantfamilyoffiltermatch.py b/src/gen/filters/rules/person/_isdescendantfamilyoffiltermatch.py index 47e5078f1..3c0574479 100644 --- a/src/gen/filters/rules/person/_isdescendantfamilyoffiltermatch.py +++ b/src/gen/filters/rules/person/_isdescendantfamilyoffiltermatch.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_isdescendantof.py b/src/gen/filters/rules/person/_isdescendantof.py index eb211145e..116ca97e0 100644 --- a/src/gen/filters/rules/person/_isdescendantof.py +++ b/src/gen/filters/rules/person/_isdescendantof.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from .. import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_isdescendantoffiltermatch.py b/src/gen/filters/rules/person/_isdescendantoffiltermatch.py index b33daf78e..b3371712d 100644 --- a/src/gen/filters/rules/person/_isdescendantoffiltermatch.py +++ b/src/gen/filters/rules/person/_isdescendantoffiltermatch.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_isduplicatedancestorof.py b/src/gen/filters/rules/person/_isduplicatedancestorof.py index e0bdff590..51944bf9b 100644 --- a/src/gen/filters/rules/person/_isduplicatedancestorof.py +++ b/src/gen/filters/rules/person/_isduplicatedancestorof.py @@ -26,14 +26,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from .. import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_isfemale.py b/src/gen/filters/rules/person/_isfemale.py index 9db0825f0..55a43ce04 100644 --- a/src/gen/filters/rules/person/_isfemale.py +++ b/src/gen/filters/rules/person/_isfemale.py @@ -25,15 +25,15 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule -from gen.lib import Person +from .. import Rule +from ....lib.person import Person #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_islessthannthgenerationancestorof.py b/src/gen/filters/rules/person/_islessthannthgenerationancestorof.py index 8a5474382..966d91aa6 100644 --- a/src/gen/filters/rules/person/_islessthannthgenerationancestorof.py +++ b/src/gen/filters/rules/person/_islessthannthgenerationancestorof.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from .. import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_islessthannthgenerationancestorofbookmarked.py b/src/gen/filters/rules/person/_islessthannthgenerationancestorofbookmarked.py index 562e40421..a52fc91ef 100644 --- a/src/gen/filters/rules/person/_islessthannthgenerationancestorofbookmarked.py +++ b/src/gen/filters/rules/person/_islessthannthgenerationancestorofbookmarked.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ try: set() @@ -37,7 +37,7 @@ except: # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from .. import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_islessthannthgenerationancestorofdefaultperson.py b/src/gen/filters/rules/person/_islessthannthgenerationancestorofdefaultperson.py index d280abf61..2abcf55c8 100644 --- a/src/gen/filters/rules/person/_islessthannthgenerationancestorofdefaultperson.py +++ b/src/gen/filters/rules/person/_islessthannthgenerationancestorofdefaultperson.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from .. import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_islessthannthgenerationdescendantof.py b/src/gen/filters/rules/person/_islessthannthgenerationdescendantof.py index db9ac9179..dc434df57 100644 --- a/src/gen/filters/rules/person/_islessthannthgenerationdescendantof.py +++ b/src/gen/filters/rules/person/_islessthannthgenerationdescendantof.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from .. import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_ismale.py b/src/gen/filters/rules/person/_ismale.py index 53b69105d..a1b345282 100644 --- a/src/gen/filters/rules/person/_ismale.py +++ b/src/gen/filters/rules/person/_ismale.py @@ -25,15 +25,15 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule -from gen.lib import Person +from .. import Rule +from ....lib.person import Person #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_ismorethannthgenerationancestorof.py b/src/gen/filters/rules/person/_ismorethannthgenerationancestorof.py index c54033bc6..25ba42b44 100644 --- a/src/gen/filters/rules/person/_ismorethannthgenerationancestorof.py +++ b/src/gen/filters/rules/person/_ismorethannthgenerationancestorof.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from .. import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_ismorethannthgenerationdescendantof.py b/src/gen/filters/rules/person/_ismorethannthgenerationdescendantof.py index 37f62702a..585cbef9b 100644 --- a/src/gen/filters/rules/person/_ismorethannthgenerationdescendantof.py +++ b/src/gen/filters/rules/person/_ismorethannthgenerationdescendantof.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from .. import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_isparentoffiltermatch.py b/src/gen/filters/rules/person/_isparentoffiltermatch.py index eb13839ce..54fcf820c 100644 --- a/src/gen/filters/rules/person/_isparentoffiltermatch.py +++ b/src/gen/filters/rules/person/_isparentoffiltermatch.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from .. import Rule from _matchesfilter import MatchesFilter #------------------------------------------------------------------------- diff --git a/src/gen/filters/rules/person/_isrelatedwith.py b/src/gen/filters/rules/person/_isrelatedwith.py index 889db927b..fec4ed206 100644 --- a/src/gen/filters/rules/person/_isrelatedwith.py +++ b/src/gen/filters/rules/person/_isrelatedwith.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from .. import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_issiblingoffiltermatch.py b/src/gen/filters/rules/person/_issiblingoffiltermatch.py index 865a1e78d..827e80916 100644 --- a/src/gen/filters/rules/person/_issiblingoffiltermatch.py +++ b/src/gen/filters/rules/person/_issiblingoffiltermatch.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from .. import Rule from _matchesfilter import MatchesFilter #------------------------------------------------------------------------- diff --git a/src/gen/filters/rules/person/_isspouseoffiltermatch.py b/src/gen/filters/rules/person/_isspouseoffiltermatch.py index 61d10d8c2..7bec3f74f 100644 --- a/src/gen/filters/rules/person/_isspouseoffiltermatch.py +++ b/src/gen/filters/rules/person/_isspouseoffiltermatch.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from .. import Rule from _matchesfilter import MatchesFilter #------------------------------------------------------------------------- diff --git a/src/gen/filters/rules/person/_iswitness.py b/src/gen/filters/rules/person/_iswitness.py index beab03689..6fb18005a 100644 --- a/src/gen/filters/rules/person/_iswitness.py +++ b/src/gen/filters/rules/person/_iswitness.py @@ -25,15 +25,16 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule -from gen.lib import EventRoleType, EventType +from .. import Rule +from ....lib.eventroletype import EventRoleType +from ....lib.eventtype import EventType #------------------------------------------------------------------------- # "Witnesses" diff --git a/src/gen/filters/rules/person/_matcheseventfilter.py b/src/gen/filters/rules/person/_matcheseventfilter.py index 8e554f9b3..7a7763a94 100644 --- a/src/gen/filters/rules/person/_matcheseventfilter.py +++ b/src/gen/filters/rules/person/_matcheseventfilter.py @@ -26,14 +26,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import MatchesEventFilterBase +from .. import MatchesEventFilterBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_matchesfilter.py b/src/gen/filters/rules/person/_matchesfilter.py index 6b9692616..e1aa81245 100644 --- a/src/gen/filters/rules/person/_matchesfilter.py +++ b/src/gen/filters/rules/person/_matchesfilter.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import MatchesFilterBase +from .. import MatchesFilterBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_matchessourceconfidence.py b/src/gen/filters/rules/person/_matchessourceconfidence.py index 41c860778..138fa17cb 100644 --- a/src/gen/filters/rules/person/_matchessourceconfidence.py +++ b/src/gen/filters/rules/person/_matchessourceconfidence.py @@ -26,14 +26,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import sgettext as _ +from ....ggettext import sgettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._matchessourceconfidencebase import MatchesSourceConfidenceBase +from .._matchessourceconfidencebase import MatchesSourceConfidenceBase #------------------------------------------------------------------------- # "Confidence level" diff --git a/src/gen/filters/rules/person/_matchidof.py b/src/gen/filters/rules/person/_matchidof.py index e2666dd2a..1b437568c 100644 --- a/src/gen/filters/rules/person/_matchidof.py +++ b/src/gen/filters/rules/person/_matchidof.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from .. import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_missingparent.py b/src/gen/filters/rules/person/_missingparent.py index 8b9abef56..8492c2cf8 100644 --- a/src/gen/filters/rules/person/_missingparent.py +++ b/src/gen/filters/rules/person/_missingparent.py @@ -26,14 +26,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from .. import Rule #------------------------------------------------------------------------- # "People with less than 2 parents" diff --git a/src/gen/filters/rules/person/_multiplemarriages.py b/src/gen/filters/rules/person/_multiplemarriages.py index 8712355ae..49c674a2b 100644 --- a/src/gen/filters/rules/person/_multiplemarriages.py +++ b/src/gen/filters/rules/person/_multiplemarriages.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from .. import Rule #------------------------------------------------------------------------- # "People with multiple marriage records" diff --git a/src/gen/filters/rules/person/_nevermarried.py b/src/gen/filters/rules/person/_nevermarried.py index a63c3a7b9..b484745d6 100644 --- a/src/gen/filters/rules/person/_nevermarried.py +++ b/src/gen/filters/rules/person/_nevermarried.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from .. import Rule #------------------------------------------------------------------------- # "People with no marriage records" diff --git a/src/gen/filters/rules/person/_nobirthdate.py b/src/gen/filters/rules/person/_nobirthdate.py index 3514f91e2..5c2e78d14 100644 --- a/src/gen/filters/rules/person/_nobirthdate.py +++ b/src/gen/filters/rules/person/_nobirthdate.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from .. import Rule #------------------------------------------------------------------------- # "People without a birth date" diff --git a/src/gen/filters/rules/person/_nodeathdate.py b/src/gen/filters/rules/person/_nodeathdate.py index 1002cfec6..63d5491ec 100644 --- a/src/gen/filters/rules/person/_nodeathdate.py +++ b/src/gen/filters/rules/person/_nodeathdate.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from .. import Rule #------------------------------------------------------------------------- # "People without a death date" diff --git a/src/gen/filters/rules/person/_peopleprivate.py b/src/gen/filters/rules/person/_peopleprivate.py index df30eef1e..829b70412 100644 --- a/src/gen/filters/rules/person/_peopleprivate.py +++ b/src/gen/filters/rules/person/_peopleprivate.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._isprivate import IsPrivate +from .._isprivate import IsPrivate #------------------------------------------------------------------------- # "People marked private" diff --git a/src/gen/filters/rules/person/_peoplepublic.py b/src/gen/filters/rules/person/_peoplepublic.py index c76799a84..8013969e6 100644 --- a/src/gen/filters/rules/person/_peoplepublic.py +++ b/src/gen/filters/rules/person/_peoplepublic.py @@ -26,14 +26,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._ispublic import IsPublic +from .._ispublic import IsPublic #------------------------------------------------------------------------- # "People marked private" diff --git a/src/gen/filters/rules/person/_personwithincompleteevent.py b/src/gen/filters/rules/person/_personwithincompleteevent.py index 58c28d9fd..694bc5fca 100644 --- a/src/gen/filters/rules/person/_personwithincompleteevent.py +++ b/src/gen/filters/rules/person/_personwithincompleteevent.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from .. import Rule #------------------------------------------------------------------------- # "People with incomplete events" diff --git a/src/gen/filters/rules/person/_probablyalive.py b/src/gen/filters/rules/person/_probablyalive.py index 52b0b8521..4ea228b2c 100644 --- a/src/gen/filters/rules/person/_probablyalive.py +++ b/src/gen/filters/rules/person/_probablyalive.py @@ -25,16 +25,16 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.utils.alive import probably_alive -from gen.filters.rules import Rule -import gen.datehandler +from ....utils.alive import probably_alive +from .. import Rule +from ....datehandler import parser #------------------------------------------------------------------------- # "People probably alive" @@ -49,7 +49,7 @@ class ProbablyAlive(Rule): def prepare(self,db): try: - self.current_date = gen.datehandler.parser.parse(unicode(self.list[0])) + self.current_date = parser.parse(unicode(self.list[0])) except: self.current_date = None diff --git a/src/gen/filters/rules/person/_regexpidof.py b/src/gen/filters/rules/person/_regexpidof.py index 27b073e86..31ae5b72f 100644 --- a/src/gen/filters/rules/person/_regexpidof.py +++ b/src/gen/filters/rules/person/_regexpidof.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._regexpidbase import RegExpIdBase +from .._regexpidbase import RegExpIdBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_regexpname.py b/src/gen/filters/rules/person/_regexpname.py index 39810f52c..fe2e2919c 100644 --- a/src/gen/filters/rules/person/_regexpname.py +++ b/src/gen/filters/rules/person/_regexpname.py @@ -26,14 +26,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from .. import Rule import re #------------------------------------------------------------------------- diff --git a/src/gen/filters/rules/person/_relationshippathbetween.py b/src/gen/filters/rules/person/_relationshippathbetween.py index ccdd0d5fc..466b76a07 100644 --- a/src/gen/filters/rules/person/_relationshippathbetween.py +++ b/src/gen/filters/rules/person/_relationshippathbetween.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from .. import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_relationshippathbetweenbookmarks.py b/src/gen/filters/rules/person/_relationshippathbetweenbookmarks.py index af658ba01..344c9c918 100644 --- a/src/gen/filters/rules/person/_relationshippathbetweenbookmarks.py +++ b/src/gen/filters/rules/person/_relationshippathbetweenbookmarks.py @@ -25,7 +25,7 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ try: set() except NameError: @@ -35,7 +35,7 @@ except NameError: # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from .. import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_searchname.py b/src/gen/filters/rules/person/_searchname.py index 20305ab45..eb0bf6e86 100644 --- a/src/gen/filters/rules/person/_searchname.py +++ b/src/gen/filters/rules/person/_searchname.py @@ -26,14 +26,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from .. import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/place/_allplaces.py b/src/gen/filters/rules/place/_allplaces.py index 383c3d2a2..ad3c4dbd7 100644 --- a/src/gen/filters/rules/place/_allplaces.py +++ b/src/gen/filters/rules/place/_allplaces.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._everything import Everything +from .._everything import Everything #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/place/_changedsince.py b/src/gen/filters/rules/place/_changedsince.py index 129bcb7ad..de9bd222e 100644 --- a/src/gen/filters/rules/place/_changedsince.py +++ b/src/gen/filters/rules/place/_changedsince.py @@ -26,14 +26,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._changedsincebase import ChangedSinceBase +from .._changedsincebase import ChangedSinceBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/place/_hascitation.py b/src/gen/filters/rules/place/_hascitation.py index cf38b1e9d..8e1239bdb 100644 --- a/src/gen/filters/rules/place/_hascitation.py +++ b/src/gen/filters/rules/place/_hascitation.py @@ -29,14 +29,14 @@ Filter rule to match family with a particular citation. # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hascitationbase import HasCitationBase +from .._hascitationbase import HasCitationBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/place/_hasgallery.py b/src/gen/filters/rules/place/_hasgallery.py index dcc545a4c..9ad91ad52 100755 --- a/src/gen/filters/rules/place/_hasgallery.py +++ b/src/gen/filters/rules/place/_hasgallery.py @@ -28,14 +28,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hasgallerybase import HasGalleryBase +from .._hasgallerybase import HasGalleryBase #------------------------------------------------------------------------- # "Places who have media object reference" diff --git a/src/gen/filters/rules/place/_hasidof.py b/src/gen/filters/rules/place/_hasidof.py index 9a67fc82b..c2be8a6e4 100644 --- a/src/gen/filters/rules/place/_hasidof.py +++ b/src/gen/filters/rules/place/_hasidof.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import HasGrampsId +from .. import HasGrampsId #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/place/_hasnolatorlon.py b/src/gen/filters/rules/place/_hasnolatorlon.py index 7a8124588..b0c9ee143 100644 --- a/src/gen/filters/rules/place/_hasnolatorlon.py +++ b/src/gen/filters/rules/place/_hasnolatorlon.py @@ -27,14 +27,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from .. import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/place/_hasnote.py b/src/gen/filters/rules/place/_hasnote.py index c86ea4730..cd936c109 100755 --- a/src/gen/filters/rules/place/_hasnote.py +++ b/src/gen/filters/rules/place/_hasnote.py @@ -28,14 +28,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hasnotebase import HasNoteBase +from .._hasnotebase import HasNoteBase #------------------------------------------------------------------------- # "Places having notes" diff --git a/src/gen/filters/rules/place/_hasnotematchingsubstringof.py b/src/gen/filters/rules/place/_hasnotematchingsubstringof.py index ff1fb3e4c..333eef214 100644 --- a/src/gen/filters/rules/place/_hasnotematchingsubstringof.py +++ b/src/gen/filters/rules/place/_hasnotematchingsubstringof.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hasnotesubstrbase import HasNoteSubstrBase +from .._hasnotesubstrbase import HasNoteSubstrBase #------------------------------------------------------------------------- # "Events having notes that contain a substring" diff --git a/src/gen/filters/rules/place/_hasnoteregexp.py b/src/gen/filters/rules/place/_hasnoteregexp.py index 9876e86c8..4242cd226 100644 --- a/src/gen/filters/rules/place/_hasnoteregexp.py +++ b/src/gen/filters/rules/place/_hasnoteregexp.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hasnoteregexbase import HasNoteRegexBase +from .._hasnoteregexbase import HasNoteRegexBase #------------------------------------------------------------------------- # "Places having notes that contain a substring" diff --git a/src/gen/filters/rules/place/_hasplace.py b/src/gen/filters/rules/place/_hasplace.py index ff53b589a..d9d1afb1b 100644 --- a/src/gen/filters/rules/place/_hasplace.py +++ b/src/gen/filters/rules/place/_hasplace.py @@ -27,14 +27,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from .. import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/place/_hasreferencecountof.py b/src/gen/filters/rules/place/_hasreferencecountof.py index fa5c435de..8f337bd38 100644 --- a/src/gen/filters/rules/place/_hasreferencecountof.py +++ b/src/gen/filters/rules/place/_hasreferencecountof.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hasreferencecountbase import HasReferenceCountBase +from .._hasreferencecountbase import HasReferenceCountBase #------------------------------------------------------------------------- # "Place objects with a certain reference count" diff --git a/src/gen/filters/rules/place/_hassourcecount.py b/src/gen/filters/rules/place/_hassourcecount.py index 14548a37c..e9d316a42 100644 --- a/src/gen/filters/rules/place/_hassourcecount.py +++ b/src/gen/filters/rules/place/_hassourcecount.py @@ -28,14 +28,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hassourcecountbase import HasSourceCountBase +from .._hassourcecountbase import HasSourceCountBase #------------------------------------------------------------------------- # "People having sources" diff --git a/src/gen/filters/rules/place/_hassourceof.py b/src/gen/filters/rules/place/_hassourceof.py index 5fdff8ff7..fc958ad2c 100644 --- a/src/gen/filters/rules/place/_hassourceof.py +++ b/src/gen/filters/rules/place/_hassourceof.py @@ -26,14 +26,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hassourceofbase import HasSourceOfBase +from .._hassourceofbase import HasSourceOfBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/place/_inlatlonneighborhood.py b/src/gen/filters/rules/place/_inlatlonneighborhood.py index 87a940740..f6aee6e22 100644 --- a/src/gen/filters/rules/place/_inlatlonneighborhood.py +++ b/src/gen/filters/rules/place/_inlatlonneighborhood.py @@ -27,15 +27,15 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule -from gen.utils.place import conv_lat_lon +from .. import Rule +from ....utils.place import conv_lat_lon #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/place/_matcheseventfilter.py b/src/gen/filters/rules/place/_matcheseventfilter.py index fa1036e50..a38f2f2c4 100644 --- a/src/gen/filters/rules/place/_matcheseventfilter.py +++ b/src/gen/filters/rules/place/_matcheseventfilter.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._matchesfilterbase import MatchesFilterBase +from .._matchesfilterbase import MatchesFilterBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/place/_matchesfilter.py b/src/gen/filters/rules/place/_matchesfilter.py index b0e7f03ca..8e6100322 100644 --- a/src/gen/filters/rules/place/_matchesfilter.py +++ b/src/gen/filters/rules/place/_matchesfilter.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._matchesfilterbase import MatchesFilterBase +from .._matchesfilterbase import MatchesFilterBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/place/_matchessourceconfidence.py b/src/gen/filters/rules/place/_matchessourceconfidence.py index bb1999278..916aaf974 100644 --- a/src/gen/filters/rules/place/_matchessourceconfidence.py +++ b/src/gen/filters/rules/place/_matchessourceconfidence.py @@ -26,14 +26,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import sgettext as _ +from ....ggettext import sgettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._matchessourceconfidencebase import MatchesSourceConfidenceBase +from .._matchessourceconfidencebase import MatchesSourceConfidenceBase #------------------------------------------------------------------------- # "Confidence level" diff --git a/src/gen/filters/rules/place/_placeprivate.py b/src/gen/filters/rules/place/_placeprivate.py index ab1ac6085..65e1dc73b 100644 --- a/src/gen/filters/rules/place/_placeprivate.py +++ b/src/gen/filters/rules/place/_placeprivate.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._isprivate import IsPrivate +from .._isprivate import IsPrivate #------------------------------------------------------------------------- # "Family marked private" diff --git a/src/gen/filters/rules/place/_regexpidof.py b/src/gen/filters/rules/place/_regexpidof.py index c493e92b5..b0d8a8035 100644 --- a/src/gen/filters/rules/place/_regexpidof.py +++ b/src/gen/filters/rules/place/_regexpidof.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._regexpidbase import RegExpIdBase +from .._regexpidbase import RegExpIdBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/repository/_allrepos.py b/src/gen/filters/rules/repository/_allrepos.py index 05367e52d..4ce03d3b3 100644 --- a/src/gen/filters/rules/repository/_allrepos.py +++ b/src/gen/filters/rules/repository/_allrepos.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._everything import Everything +from .._everything import Everything #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/repository/_changedsince.py b/src/gen/filters/rules/repository/_changedsince.py index 85db53ae5..07010061a 100644 --- a/src/gen/filters/rules/repository/_changedsince.py +++ b/src/gen/filters/rules/repository/_changedsince.py @@ -26,14 +26,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._changedsincebase import ChangedSinceBase +from .._changedsincebase import ChangedSinceBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/repository/_hasidof.py b/src/gen/filters/rules/repository/_hasidof.py index 304664e22..112d49c5b 100644 --- a/src/gen/filters/rules/repository/_hasidof.py +++ b/src/gen/filters/rules/repository/_hasidof.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import HasGrampsId +from .. import HasGrampsId #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/repository/_hasnotematchingsubstringof.py b/src/gen/filters/rules/repository/_hasnotematchingsubstringof.py index 611989202..1f0e12e10 100644 --- a/src/gen/filters/rules/repository/_hasnotematchingsubstringof.py +++ b/src/gen/filters/rules/repository/_hasnotematchingsubstringof.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hasnotesubstrbase import HasNoteSubstrBase +from .._hasnotesubstrbase import HasNoteSubstrBase #------------------------------------------------------------------------- # "Events having notes that contain a substring" diff --git a/src/gen/filters/rules/repository/_hasnoteregexp.py b/src/gen/filters/rules/repository/_hasnoteregexp.py index 4564ec175..f01be904e 100644 --- a/src/gen/filters/rules/repository/_hasnoteregexp.py +++ b/src/gen/filters/rules/repository/_hasnoteregexp.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hasnoteregexbase import HasNoteRegexBase +from .._hasnoteregexbase import HasNoteRegexBase #------------------------------------------------------------------------- # "Repos having notes that contain a substring" diff --git a/src/gen/filters/rules/repository/_hasreferencecountof.py b/src/gen/filters/rules/repository/_hasreferencecountof.py index f4cbccaa9..8b120e009 100644 --- a/src/gen/filters/rules/repository/_hasreferencecountof.py +++ b/src/gen/filters/rules/repository/_hasreferencecountof.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hasreferencecountbase import HasReferenceCountBase +from .._hasreferencecountbase import HasReferenceCountBase #------------------------------------------------------------------------- # "Repositories with a certain reference count" diff --git a/src/gen/filters/rules/repository/_hasrepo.py b/src/gen/filters/rules/repository/_hasrepo.py index 30b9ae8b7..49ac7f321 100644 --- a/src/gen/filters/rules/repository/_hasrepo.py +++ b/src/gen/filters/rules/repository/_hasrepo.py @@ -25,15 +25,15 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib import RepositoryType -from gen.filters.rules import Rule +from ....lib.repotype import RepositoryType +from .. import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/repository/_matchesfilter.py b/src/gen/filters/rules/repository/_matchesfilter.py index b04211619..8f7a583a5 100644 --- a/src/gen/filters/rules/repository/_matchesfilter.py +++ b/src/gen/filters/rules/repository/_matchesfilter.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._matchesfilterbase import MatchesFilterBase +from .._matchesfilterbase import MatchesFilterBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/repository/_matchesnamesubstringof.py b/src/gen/filters/rules/repository/_matchesnamesubstringof.py index 674d49758..90124ddb0 100644 --- a/src/gen/filters/rules/repository/_matchesnamesubstringof.py +++ b/src/gen/filters/rules/repository/_matchesnamesubstringof.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from .. import Rule #------------------------------------------------------------------------- # "Repositories having a name that contain a substring" diff --git a/src/gen/filters/rules/repository/_regexpidof.py b/src/gen/filters/rules/repository/_regexpidof.py index 9ef2f6566..a25b7d651 100644 --- a/src/gen/filters/rules/repository/_regexpidof.py +++ b/src/gen/filters/rules/repository/_regexpidof.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._regexpidbase import RegExpIdBase +from .._regexpidbase import RegExpIdBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/repository/_repoprivate.py b/src/gen/filters/rules/repository/_repoprivate.py index 884a230a6..a4210b579 100644 --- a/src/gen/filters/rules/repository/_repoprivate.py +++ b/src/gen/filters/rules/repository/_repoprivate.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._isprivate import IsPrivate +from .._isprivate import IsPrivate #------------------------------------------------------------------------- # "Repo marked private" diff --git a/src/gen/filters/rules/source/__init__.py b/src/gen/filters/rules/source/__init__.py index 640477a2d..b8ff52d7f 100644 --- a/src/gen/filters/rules/source/__init__.py +++ b/src/gen/filters/rules/source/__init__.py @@ -26,7 +26,7 @@ Package providing filter rules for GRAMPS. """ -from gen.filters.rules._hassourcebase import HasSourceBase as HasSource +from .._hassourcebase import HasSourceBase as HasSource from _allsources import AllSources from _hasgallery import HasGallery diff --git a/src/gen/filters/rules/source/_allsources.py b/src/gen/filters/rules/source/_allsources.py index 62f0aa0ff..438d2efbc 100644 --- a/src/gen/filters/rules/source/_allsources.py +++ b/src/gen/filters/rules/source/_allsources.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._everything import Everything +from .._everything import Everything #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/source/_changedsince.py b/src/gen/filters/rules/source/_changedsince.py index add82942f..48427d097 100644 --- a/src/gen/filters/rules/source/_changedsince.py +++ b/src/gen/filters/rules/source/_changedsince.py @@ -26,14 +26,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._changedsincebase import ChangedSinceBase +from .._changedsincebase import ChangedSinceBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/source/_hasgallery.py b/src/gen/filters/rules/source/_hasgallery.py index fdbff0789..dd56fcba8 100755 --- a/src/gen/filters/rules/source/_hasgallery.py +++ b/src/gen/filters/rules/source/_hasgallery.py @@ -28,14 +28,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hasgallerybase import HasGalleryBase +from .._hasgallerybase import HasGalleryBase #------------------------------------------------------------------------- # "Sources who have media object reference" diff --git a/src/gen/filters/rules/source/_hasidof.py b/src/gen/filters/rules/source/_hasidof.py index e7a411204..d2bd73d80 100644 --- a/src/gen/filters/rules/source/_hasidof.py +++ b/src/gen/filters/rules/source/_hasidof.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import HasGrampsId +from .. import HasGrampsId #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/source/_hasnote.py b/src/gen/filters/rules/source/_hasnote.py index 42b62cb0c..cade6df58 100755 --- a/src/gen/filters/rules/source/_hasnote.py +++ b/src/gen/filters/rules/source/_hasnote.py @@ -28,14 +28,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hasnotebase import HasNoteBase +from .._hasnotebase import HasNoteBase #------------------------------------------------------------------------- # "Sources having notes" diff --git a/src/gen/filters/rules/source/_hasnotematchingsubstringof.py b/src/gen/filters/rules/source/_hasnotematchingsubstringof.py index 62cfb3fb3..2ba763b54 100644 --- a/src/gen/filters/rules/source/_hasnotematchingsubstringof.py +++ b/src/gen/filters/rules/source/_hasnotematchingsubstringof.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hasnotesubstrbase import HasNoteSubstrBase +from .._hasnotesubstrbase import HasNoteSubstrBase #------------------------------------------------------------------------- # "Events having notes that contain a substring" diff --git a/src/gen/filters/rules/source/_hasnoteregexp.py b/src/gen/filters/rules/source/_hasnoteregexp.py index dabd70be8..631b27e66 100644 --- a/src/gen/filters/rules/source/_hasnoteregexp.py +++ b/src/gen/filters/rules/source/_hasnoteregexp.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hasnoteregexbase import HasNoteRegexBase +from .._hasnoteregexbase import HasNoteRegexBase #------------------------------------------------------------------------- # "Sources having notes that contain a substring" diff --git a/src/gen/filters/rules/source/_hasreferencecountof.py b/src/gen/filters/rules/source/_hasreferencecountof.py index 51a2b89cb..4b1022ace 100644 --- a/src/gen/filters/rules/source/_hasreferencecountof.py +++ b/src/gen/filters/rules/source/_hasreferencecountof.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._hasreferencecountbase import HasReferenceCountBase +from .._hasreferencecountbase import HasReferenceCountBase #------------------------------------------------------------------------- # "Source objects with a certain reference count" diff --git a/src/gen/filters/rules/source/_hasrepository.py b/src/gen/filters/rules/source/_hasrepository.py index f6af099db..3dceab31a 100644 --- a/src/gen/filters/rules/source/_hasrepository.py +++ b/src/gen/filters/rules/source/_hasrepository.py @@ -29,14 +29,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from .. import Rule #------------------------------------------------------------------------- # "People who have images" diff --git a/src/gen/filters/rules/source/_hasrepositorycallnumberref.py b/src/gen/filters/rules/source/_hasrepositorycallnumberref.py index 3d5f19012..54c097ac0 100644 --- a/src/gen/filters/rules/source/_hasrepositorycallnumberref.py +++ b/src/gen/filters/rules/source/_hasrepositorycallnumberref.py @@ -26,14 +26,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from .. import Rule #------------------------------------------------------------------------- # "Sources which reference repositories by a special Call Name" diff --git a/src/gen/filters/rules/source/_matchesfilter.py b/src/gen/filters/rules/source/_matchesfilter.py index 7c1a746e4..fd3ea414b 100644 --- a/src/gen/filters/rules/source/_matchesfilter.py +++ b/src/gen/filters/rules/source/_matchesfilter.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._matchesfilterbase import MatchesFilterBase +from .._matchesfilterbase import MatchesFilterBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/source/_matchesrepositoryfilter.py b/src/gen/filters/rules/source/_matchesrepositoryfilter.py index bcea5ee28..2c31f55e0 100644 --- a/src/gen/filters/rules/source/_matchesrepositoryfilter.py +++ b/src/gen/filters/rules/source/_matchesrepositoryfilter.py @@ -26,14 +26,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import MatchesFilterBase +from .. import MatchesFilterBase #------------------------------------------------------------------------- # "Sources which reference a repository by selection" diff --git a/src/gen/filters/rules/source/_matchestitlesubstringof.py b/src/gen/filters/rules/source/_matchestitlesubstringof.py index c5a2416c0..d1c7b11d1 100644 --- a/src/gen/filters/rules/source/_matchestitlesubstringof.py +++ b/src/gen/filters/rules/source/_matchestitlesubstringof.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules import Rule +from .. import Rule #------------------------------------------------------------------------- # "Sources having a title that contain a substring" diff --git a/src/gen/filters/rules/source/_regexpidof.py b/src/gen/filters/rules/source/_regexpidof.py index f56adb03c..a08076660 100644 --- a/src/gen/filters/rules/source/_regexpidof.py +++ b/src/gen/filters/rules/source/_regexpidof.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._regexpidbase import RegExpIdBase +from .._regexpidbase import RegExpIdBase #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/source/_sourceprivate.py b/src/gen/filters/rules/source/_sourceprivate.py index 452b69173..191ef9ee4 100644 --- a/src/gen/filters/rules/source/_sourceprivate.py +++ b/src/gen/filters/rules/source/_sourceprivate.py @@ -25,14 +25,14 @@ # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ....ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._isprivate import IsPrivate +from .._isprivate import IsPrivate #------------------------------------------------------------------------- # "Family marked private" diff --git a/src/gen/lib/__init__.py b/src/gen/lib/__init__.py index b01fd9a74..6121b3c56 100644 --- a/src/gen/lib/__init__.py +++ b/src/gen/lib/__init__.py @@ -21,62 +21,62 @@ # $Id$ -"""The core library of GRAMPS objects""" - +"""The core library of GRAMPS objects +""" # Dates -from gen.lib.date import Date, DateError, Span +from date import Date, DateError, Span # Secondary objects -from gen.lib.secondaryobj import SecondaryObject -from gen.lib.address import Address -from gen.lib.location import Location -from gen.lib.attribute import Attribute -from gen.lib.eventref import EventRef -from gen.lib.ldsord import LdsOrd -from gen.lib.mediaref import MediaRef -from gen.lib.name import Name -from gen.lib.reporef import RepoRef -from gen.lib.surname import Surname -from gen.lib.url import Url -from gen.lib.witness import Witness -from gen.lib.childref import ChildRef +from secondaryobj import SecondaryObject +from address import Address +from location import Location +from attribute import Attribute +from eventref import EventRef +from ldsord import LdsOrd +from mediaref import MediaRef +from name import Name +from reporef import RepoRef +from surname import Surname +from url import Url +from witness import Witness +from childref import ChildRef # Primary objects -from gen.lib.primaryobj import PrimaryObject -from gen.lib.person import Person -from gen.lib.personref import PersonRef -from gen.lib.family import Family -from gen.lib.event import Event -from gen.lib.place import Place -from gen.lib.src import Source -from gen.lib.mediaobj import MediaObject -from gen.lib.repo import Repository -from gen.lib.note import Note -from gen.lib.citation import Citation +from primaryobj import PrimaryObject +from person import Person +from personref import PersonRef +from family import Family +from event import Event +from place import Place +from src import Source +from mediaobj import MediaObject +from repo import Repository +from note import Note +from citation import Citation # Table objects -from gen.lib.tag import Tag +from tag import Tag # These are actually metadata -from gen.lib.genderstats import GenderStats -from gen.lib.researcher import Researcher +from genderstats import GenderStats +from researcher import Researcher # Type classes -from gen.lib.grampstype import GrampsType -from gen.lib.nametype import NameType -from gen.lib.attrtype import AttributeType -from gen.lib.urltype import UrlType -from gen.lib.childreftype import ChildRefType -from gen.lib.repotype import RepositoryType -from gen.lib.eventtype import EventType -from gen.lib.familyreltype import FamilyRelType -from gen.lib.srcmediatype import SourceMediaType -from gen.lib.eventroletype import EventRoleType -from gen.lib.markertype import MarkerType -from gen.lib.nameorigintype import NameOriginType -from gen.lib.notetype import NoteType -from gen.lib.styledtexttagtype import StyledTextTagType +from grampstype import GrampsType +from nametype import NameType +from attrtype import AttributeType +from urltype import UrlType +from childreftype import ChildRefType +from repotype import RepositoryType +from eventtype import EventType +from familyreltype import FamilyRelType +from srcmediatype import SourceMediaType +from eventroletype import EventRoleType +from markertype import MarkerType +from nameorigintype import NameOriginType +from notetype import NoteType +from styledtexttagtype import StyledTextTagType # Text -from gen.lib.styledtexttag import StyledTextTag -from gen.lib.styledtext import StyledText +from styledtexttag import StyledTextTag +from styledtext import StyledText diff --git a/src/gen/lib/address.py b/src/gen/lib/address.py index 2da05fb13..138dbb007 100644 --- a/src/gen/lib/address.py +++ b/src/gen/lib/address.py @@ -31,13 +31,13 @@ Address class for GRAMPS. # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib.secondaryobj import SecondaryObject -from gen.lib.privacybase import PrivacyBase -from gen.lib.citationbase import CitationBase -from gen.lib.notebase import NoteBase -from gen.lib.datebase import DateBase -from gen.lib.locationbase import LocationBase -from gen.lib.const import IDENTICAL, EQUAL, DIFFERENT +from secondaryobj import SecondaryObject +from privacybase import PrivacyBase +from citationbase import CitationBase +from notebase import NoteBase +from datebase import DateBase +from locationbase import LocationBase +from const import IDENTICAL, EQUAL, DIFFERENT #------------------------------------------------------------------------- # diff --git a/src/gen/lib/addressbase.py b/src/gen/lib/addressbase.py index 603364da5..78097bb1c 100644 --- a/src/gen/lib/addressbase.py +++ b/src/gen/lib/addressbase.py @@ -30,8 +30,8 @@ AddressBase class for GRAMPS. # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib.address import Address -from gen.lib.const import IDENTICAL, EQUAL +from address import Address +from const import IDENTICAL, EQUAL #------------------------------------------------------------------------- # diff --git a/src/gen/lib/attrbase.py b/src/gen/lib/attrbase.py index cb2210941..823582597 100644 --- a/src/gen/lib/attrbase.py +++ b/src/gen/lib/attrbase.py @@ -30,8 +30,8 @@ AttributeBase class for GRAMPS. # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib.attribute import Attribute -from gen.lib.const import IDENTICAL, EQUAL +from attribute import Attribute +from const import IDENTICAL, EQUAL #------------------------------------------------------------------------- # diff --git a/src/gen/lib/attribute.py b/src/gen/lib/attribute.py index 6a2e94c5f..f21227279 100644 --- a/src/gen/lib/attribute.py +++ b/src/gen/lib/attribute.py @@ -31,12 +31,12 @@ Attribute class for GRAMPS. # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib.secondaryobj import SecondaryObject -from gen.lib.privacybase import PrivacyBase -from gen.lib.citationbase import CitationBase -from gen.lib.notebase import NoteBase -from gen.lib.attrtype import AttributeType -from gen.lib.const import IDENTICAL, EQUAL, DIFFERENT +from secondaryobj import SecondaryObject +from privacybase import PrivacyBase +from citationbase import CitationBase +from notebase import NoteBase +from attrtype import AttributeType +from const import IDENTICAL, EQUAL, DIFFERENT #------------------------------------------------------------------------- # diff --git a/src/gen/lib/attrtype.py b/src/gen/lib/attrtype.py index b703b9376..fbd4b81ab 100644 --- a/src/gen/lib/attrtype.py +++ b/src/gen/lib/attrtype.py @@ -29,13 +29,13 @@ Provide the different Attribute Types for GRAMPS. # Standard Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ..ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib.grampstype import GrampsType +from grampstype import GrampsType class AttributeType(GrampsType): diff --git a/src/gen/lib/childref.py b/src/gen/lib/childref.py index 2d6899ffd..4169b4e4c 100644 --- a/src/gen/lib/childref.py +++ b/src/gen/lib/childref.py @@ -30,13 +30,13 @@ Child Reference class for GRAMPS. # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib.secondaryobj import SecondaryObject -from gen.lib.privacybase import PrivacyBase -from gen.lib.citationbase import CitationBase -from gen.lib.notebase import NoteBase -from gen.lib.refbase import RefBase -from gen.lib.childreftype import ChildRefType -from gen.lib.const import IDENTICAL, EQUAL, DIFFERENT +from secondaryobj import SecondaryObject +from privacybase import PrivacyBase +from citationbase import CitationBase +from notebase import NoteBase +from refbase import RefBase +from childreftype import ChildRefType +from const import IDENTICAL, EQUAL, DIFFERENT #------------------------------------------------------------------------- # diff --git a/src/gen/lib/childreftype.py b/src/gen/lib/childreftype.py index 7e56c3a44..6a8d266e3 100644 --- a/src/gen/lib/childreftype.py +++ b/src/gen/lib/childreftype.py @@ -28,14 +28,14 @@ Provide the different child reference types. # standard python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ..ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib.grampstype import GrampsType +from grampstype import GrampsType class ChildRefType(GrampsType): """ diff --git a/src/gen/lib/citation.py b/src/gen/lib/citation.py index e0dd8fbea..8b084ad35 100644 --- a/src/gen/lib/citation.py +++ b/src/gen/lib/citation.py @@ -39,10 +39,10 @@ LOG = logging.getLogger(".citation") # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib.primaryobj import PrimaryObject -from gen.lib.mediabase import MediaBase -from gen.lib.notebase import NoteBase -from gen.lib.datebase import DateBase +from primaryobj import PrimaryObject +from mediabase import MediaBase +from notebase import NoteBase +from datebase import DateBase #------------------------------------------------------------------------- # diff --git a/src/gen/lib/date.py b/src/gen/lib/date.py index 526617112..d0277c969 100644 --- a/src/gen/lib/date.py +++ b/src/gen/lib/date.py @@ -28,8 +28,8 @@ # Python modules # #------------------------------------------------------------------------ -from gen.ggettext import sgettext as _ -from gen.ggettext import ngettext +from ..ggettext import sgettext as _ +from ..ggettext import ngettext #------------------------------------------------------------------------ # @@ -51,13 +51,12 @@ log = logging.getLogger(".Date") # Gramps modules # #------------------------------------------------------------------------ -from gen.lib.calendar import (gregorian_sdn, julian_sdn, hebrew_sdn, - french_sdn, persian_sdn, islamic_sdn, - swedish_sdn, - gregorian_ymd, julian_ymd, hebrew_ymd, - french_ymd, persian_ymd, islamic_ymd, - swedish_ymd) -from gen.config import config +from calendar import (gregorian_sdn, julian_sdn, hebrew_sdn, + french_sdn, persian_sdn, islamic_sdn, swedish_sdn, + gregorian_ymd, julian_ymd, hebrew_ymd, + french_ymd, persian_ymd, islamic_ymd, + swedish_ymd) +from ..config import config #------------------------------------------------------------------------- # diff --git a/src/gen/lib/datebase.py b/src/gen/lib/datebase.py index 8a4788a35..73118c1a7 100644 --- a/src/gen/lib/datebase.py +++ b/src/gen/lib/datebase.py @@ -29,7 +29,7 @@ DateBase class for GRAMPS. # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib.date import Date +from date import Date #------------------------------------------------------------------------- # diff --git a/src/gen/lib/event.py b/src/gen/lib/event.py index 963cd88ba..48f3d2110 100644 --- a/src/gen/lib/event.py +++ b/src/gen/lib/event.py @@ -39,14 +39,14 @@ LOG = logging.getLogger(".citation") # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib.primaryobj import PrimaryObject -from gen.lib.citationbase import CitationBase -from gen.lib.notebase import NoteBase -from gen.lib.mediabase import MediaBase -from gen.lib.attrbase import AttributeBase -from gen.lib.datebase import DateBase -from gen.lib.placebase import PlaceBase -from gen.lib.eventtype import EventType +from primaryobj import PrimaryObject +from citationbase import CitationBase +from notebase import NoteBase +from mediabase import MediaBase +from attrbase import AttributeBase +from datebase import DateBase +from placebase import PlaceBase +from eventtype import EventType #------------------------------------------------------------------------- # diff --git a/src/gen/lib/eventref.py b/src/gen/lib/eventref.py index 3129cbc9a..dce673a2b 100644 --- a/src/gen/lib/eventref.py +++ b/src/gen/lib/eventref.py @@ -31,13 +31,13 @@ Event Reference class for GRAMPS # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib.secondaryobj import SecondaryObject -from gen.lib.privacybase import PrivacyBase -from gen.lib.notebase import NoteBase -from gen.lib.attrbase import AttributeBase -from gen.lib.refbase import RefBase -from gen.lib.eventroletype import EventRoleType -from gen.lib.const import IDENTICAL, EQUAL, DIFFERENT +from secondaryobj import SecondaryObject +from privacybase import PrivacyBase +from notebase import NoteBase +from attrbase import AttributeBase +from refbase import RefBase +from eventroletype import EventRoleType +from const import IDENTICAL, EQUAL, DIFFERENT #------------------------------------------------------------------------- # diff --git a/src/gen/lib/eventroletype.py b/src/gen/lib/eventroletype.py index cda9c31d1..0180bd6d7 100644 --- a/src/gen/lib/eventroletype.py +++ b/src/gen/lib/eventroletype.py @@ -28,14 +28,14 @@ Provide the different event roles. # Python modules # #------------------------------------------------------------------------ -from gen.ggettext import sgettext as _ +from ..ggettext import sgettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib.grampstype import GrampsType +from grampstype import GrampsType class EventRoleType(GrampsType): diff --git a/src/gen/lib/eventtype.py b/src/gen/lib/eventtype.py index 353d61b30..a6c89f7c5 100644 --- a/src/gen/lib/eventtype.py +++ b/src/gen/lib/eventtype.py @@ -29,14 +29,14 @@ Provide the different event types # Python modules # #------------------------------------------------------------------------ -from gen.ggettext import sgettext as _ +from ..ggettext import sgettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib.grampstype import GrampsType +from grampstype import GrampsType class EventType(GrampsType): """ diff --git a/src/gen/lib/family.py b/src/gen/lib/family.py index 9864d22b4..c604ce068 100644 --- a/src/gen/lib/family.py +++ b/src/gen/lib/family.py @@ -41,17 +41,17 @@ LOG = logging.getLogger(".citation") # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib.primaryobj import PrimaryObject -from gen.lib.citationbase import CitationBase -from gen.lib.notebase import NoteBase -from gen.lib.mediabase import MediaBase -from gen.lib.attrbase import AttributeBase -from gen.lib.eventref import EventRef -from gen.lib.ldsordbase import LdsOrdBase -from gen.lib.tagbase import TagBase -from gen.lib.childref import ChildRef -from gen.lib.familyreltype import FamilyRelType -from gen.lib.const import IDENTICAL, EQUAL, DIFFERENT +from primaryobj import PrimaryObject +from citationbase import CitationBase +from notebase import NoteBase +from mediabase import MediaBase +from attrbase import AttributeBase +from eventref import EventRef +from ldsordbase import LdsOrdBase +from tagbase import TagBase +from childref import ChildRef +from familyreltype import FamilyRelType +from const import IDENTICAL, EQUAL, DIFFERENT #------------------------------------------------------------------------- # diff --git a/src/gen/lib/familyreltype.py b/src/gen/lib/familyreltype.py index aa962afcb..4eb427da5 100644 --- a/src/gen/lib/familyreltype.py +++ b/src/gen/lib/familyreltype.py @@ -27,15 +27,15 @@ Provide the different family reference types. # Python modules # #------------------------------------------------------------------------ -from gen.ggettext import gettext as _ +from ..ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib.grampstype import GrampsType -from gen.config import config +from grampstype import GrampsType +from ..config import config class FamilyRelType(GrampsType): diff --git a/src/gen/lib/genderstats.py b/src/gen/lib/genderstats.py index c8207cfbb..c8ac4461e 100644 --- a/src/gen/lib/genderstats.py +++ b/src/gen/lib/genderstats.py @@ -30,7 +30,7 @@ Gender statistics kept in GRAMPS database. # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib.person import Person +from person import Person #------------------------------------------------------------------------- # diff --git a/src/gen/lib/grampstype.py b/src/gen/lib/grampstype.py index cd1b870f4..62fcadd2b 100644 --- a/src/gen/lib/grampstype.py +++ b/src/gen/lib/grampstype.py @@ -30,7 +30,7 @@ Base type for all gramps types. # Python modules # #------------------------------------------------------------------------ -from gen.ggettext import gettext as _ +from ..ggettext import gettext as _ _UNKNOWN = _('Unknown') #------------------------------------------------------------------------- diff --git a/src/gen/lib/ldsord.py b/src/gen/lib/ldsord.py index 0517aff0b..dba6138db 100644 --- a/src/gen/lib/ldsord.py +++ b/src/gen/lib/ldsord.py @@ -31,7 +31,7 @@ LDS Ordinance class for GRAMPS. # Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ..ggettext import gettext as _ from warnings import warn #------------------------------------------------------------------------- @@ -39,13 +39,13 @@ from warnings import warn # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib.secondaryobj import SecondaryObject -from gen.lib.citationbase import CitationBase -from gen.lib.notebase import NoteBase -from gen.lib.datebase import DateBase -from gen.lib.placebase import PlaceBase -from gen.lib.privacybase import PrivacyBase -from gen.lib.const import IDENTICAL, EQUAL, DIFFERENT +from secondaryobj import SecondaryObject +from citationbase import CitationBase +from notebase import NoteBase +from datebase import DateBase +from placebase import PlaceBase +from privacybase import PrivacyBase +from const import IDENTICAL, EQUAL, DIFFERENT #------------------------------------------------------------------------- # diff --git a/src/gen/lib/ldsordbase.py b/src/gen/lib/ldsordbase.py index d818f6ba0..02777fe09 100644 --- a/src/gen/lib/ldsordbase.py +++ b/src/gen/lib/ldsordbase.py @@ -30,8 +30,8 @@ LdsOrdBase class for GRAMPS. # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib.ldsord import LdsOrd -from gen.lib.const import IDENTICAL, EQUAL +from ldsord import LdsOrd +from const import IDENTICAL, EQUAL #------------------------------------------------------------------------- # diff --git a/src/gen/lib/location.py b/src/gen/lib/location.py index d2b8d59aa..b90633e52 100644 --- a/src/gen/lib/location.py +++ b/src/gen/lib/location.py @@ -30,9 +30,9 @@ Location class for GRAMPS. # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib.secondaryobj import SecondaryObject -from gen.lib.locationbase import LocationBase -from gen.lib.const import IDENTICAL, DIFFERENT +from secondaryobj import SecondaryObject +from locationbase import LocationBase +from const import IDENTICAL, DIFFERENT #------------------------------------------------------------------------- # diff --git a/src/gen/lib/markertype.py b/src/gen/lib/markertype.py index 996e8f6ad..fd6130600 100644 --- a/src/gen/lib/markertype.py +++ b/src/gen/lib/markertype.py @@ -38,7 +38,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib.grampstype import GrampsType +from grampstype import GrampsType class MarkerType(GrampsType): """ diff --git a/src/gen/lib/mediabase.py b/src/gen/lib/mediabase.py index 284455a2b..4a4084006 100644 --- a/src/gen/lib/mediabase.py +++ b/src/gen/lib/mediabase.py @@ -30,8 +30,8 @@ MediaBase class for GRAMPS. # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib.mediaref import MediaRef -from gen.lib.const import IDENTICAL, EQUAL, DIFFERENT +from mediaref import MediaRef +from const import IDENTICAL, EQUAL, DIFFERENT #------------------------------------------------------------------------- # diff --git a/src/gen/lib/mediaobj.py b/src/gen/lib/mediaobj.py index eac999df9..57ef699cd 100644 --- a/src/gen/lib/mediaobj.py +++ b/src/gen/lib/mediaobj.py @@ -42,12 +42,12 @@ LOG = logging.getLogger(".citation") # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib.primaryobj import PrimaryObject -from gen.lib.citationbase import CitationBase -from gen.lib.notebase import NoteBase -from gen.lib.datebase import DateBase -from gen.lib.attrbase import AttributeBase -from gen.lib.tagbase import TagBase +from primaryobj import PrimaryObject +from citationbase import CitationBase +from notebase import NoteBase +from datebase import DateBase +from attrbase import AttributeBase +from tagbase import TagBase #------------------------------------------------------------------------- # diff --git a/src/gen/lib/mediaref.py b/src/gen/lib/mediaref.py index cf1803e8a..24c79db88 100644 --- a/src/gen/lib/mediaref.py +++ b/src/gen/lib/mediaref.py @@ -31,13 +31,13 @@ Media Reference class for GRAMPS. # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib.secondaryobj import SecondaryObject -from gen.lib.privacybase import PrivacyBase -from gen.lib.citationbase import CitationBase -from gen.lib.notebase import NoteBase -from gen.lib.refbase import RefBase -from gen.lib.attrbase import AttributeBase -from gen.lib.const import IDENTICAL, EQUAL, DIFFERENT +from secondaryobj import SecondaryObject +from privacybase import PrivacyBase +from citationbase import CitationBase +from notebase import NoteBase +from refbase import RefBase +from attrbase import AttributeBase +from const import IDENTICAL, EQUAL, DIFFERENT #------------------------------------------------------------------------- # diff --git a/src/gen/lib/name.py b/src/gen/lib/name.py index b81669570..700b341d5 100644 --- a/src/gen/lib/name.py +++ b/src/gen/lib/name.py @@ -31,14 +31,14 @@ Name class for GRAMPS. # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib.secondaryobj import SecondaryObject -from gen.lib.privacybase import PrivacyBase -from gen.lib.citationbase import CitationBase -from gen.lib.notebase import NoteBase -from gen.lib.datebase import DateBase -from gen.lib.surnamebase import SurnameBase -from gen.lib.nametype import NameType -from gen.lib.const import IDENTICAL, EQUAL, DIFFERENT +from secondaryobj import SecondaryObject +from privacybase import PrivacyBase +from citationbase import CitationBase +from notebase import NoteBase +from datebase import DateBase +from surnamebase import SurnameBase +from nametype import NameType +from const import IDENTICAL, EQUAL, DIFFERENT #------------------------------------------------------------------------- # diff --git a/src/gen/lib/nameorigintype.py b/src/gen/lib/nameorigintype.py index 2ce107571..c89906a4a 100644 --- a/src/gen/lib/nameorigintype.py +++ b/src/gen/lib/nameorigintype.py @@ -29,14 +29,14 @@ Name types. # Python modules # #------------------------------------------------------------------------- -from gen.ggettext import sgettext as _ +from ..ggettext import sgettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib.grampstype import GrampsType +from grampstype import GrampsType class NameOriginType(GrampsType): """ diff --git a/src/gen/lib/nametype.py b/src/gen/lib/nametype.py index 3a2a35945..a90571cfc 100644 --- a/src/gen/lib/nametype.py +++ b/src/gen/lib/nametype.py @@ -29,14 +29,14 @@ Name types. # Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ..ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib.grampstype import GrampsType +from grampstype import GrampsType class NameType(GrampsType): diff --git a/src/gen/lib/note.py b/src/gen/lib/note.py index f2dc85e3b..620561894 100644 --- a/src/gen/lib/note.py +++ b/src/gen/lib/note.py @@ -31,10 +31,10 @@ Note class for GRAMPS. # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib.primaryobj import BasicPrimaryObject -from gen.lib.tagbase import TagBase -from gen.lib.notetype import NoteType -from gen.lib.styledtext import StyledText +from primaryobj import BasicPrimaryObject +from tagbase import TagBase +from notetype import NoteType +from styledtext import StyledText #------------------------------------------------------------------------- # diff --git a/src/gen/lib/notetype.py b/src/gen/lib/notetype.py index 859089b38..07882d44f 100644 --- a/src/gen/lib/notetype.py +++ b/src/gen/lib/notetype.py @@ -29,14 +29,14 @@ Note types. # standard python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ..ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib.grampstype import GrampsType +from grampstype import GrampsType class NoteType(GrampsType): diff --git a/src/gen/lib/person.py b/src/gen/lib/person.py index 702ea6997..9f89a808d 100644 --- a/src/gen/lib/person.py +++ b/src/gen/lib/person.py @@ -32,23 +32,23 @@ Person object for GRAMPS. # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib.primaryobj import PrimaryObject -from gen.lib.citationbase import CitationBase -from gen.lib.notebase import NoteBase -from gen.lib.mediabase import MediaBase -from gen.lib.attrbase import AttributeBase -from gen.lib.addressbase import AddressBase -from gen.lib.ldsordbase import LdsOrdBase -from gen.lib.urlbase import UrlBase -from gen.lib.tagbase import TagBase -from gen.lib.name import Name -from gen.lib.eventref import EventRef -from gen.lib.personref import PersonRef -from gen.lib.attrtype import AttributeType -from gen.lib.eventroletype import EventRoleType -from gen.lib.attribute import Attribute -from gen.lib.const import IDENTICAL, EQUAL, DIFFERENT -from gen.ggettext import gettext as _ +from primaryobj import PrimaryObject +from citationbase import CitationBase +from notebase import NoteBase +from mediabase import MediaBase +from attrbase import AttributeBase +from addressbase import AddressBase +from ldsordbase import LdsOrdBase +from urlbase import UrlBase +from tagbase import TagBase +from name import Name +from eventref import EventRef +from personref import PersonRef +from attrtype import AttributeType +from eventroletype import EventRoleType +from attribute import Attribute +from const import IDENTICAL, EQUAL, DIFFERENT +from ..ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gen/lib/personref.py b/src/gen/lib/personref.py index f0fcaf66d..7eaa06b06 100644 --- a/src/gen/lib/personref.py +++ b/src/gen/lib/personref.py @@ -31,12 +31,12 @@ Person Reference class for GRAMPS. # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib.secondaryobj import SecondaryObject -from gen.lib.privacybase import PrivacyBase -from gen.lib.citationbase import CitationBase -from gen.lib.notebase import NoteBase -from gen.lib.refbase import RefBase -from gen.lib.const import IDENTICAL, EQUAL, DIFFERENT +from secondaryobj import SecondaryObject +from privacybase import PrivacyBase +from citationbase import CitationBase +from notebase import NoteBase +from refbase import RefBase +from const import IDENTICAL, EQUAL, DIFFERENT #------------------------------------------------------------------------- # diff --git a/src/gen/lib/place.py b/src/gen/lib/place.py index 0331037ae..24b4291c6 100644 --- a/src/gen/lib/place.py +++ b/src/gen/lib/place.py @@ -31,12 +31,12 @@ Place object for GRAMPS. # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib.primaryobj import PrimaryObject -from gen.lib.citationbase import CitationBase -from gen.lib.notebase import NoteBase -from gen.lib.mediabase import MediaBase -from gen.lib.urlbase import UrlBase -from gen.lib.location import Location +from primaryobj import PrimaryObject +from citationbase import CitationBase +from notebase import NoteBase +from mediabase import MediaBase +from urlbase import UrlBase +from location import Location _EMPTY_LOC = Location().serialize() diff --git a/src/gen/lib/primaryobj.py b/src/gen/lib/primaryobj.py index 2cc08eee4..b6aa85df9 100644 --- a/src/gen/lib/primaryobj.py +++ b/src/gen/lib/primaryobj.py @@ -30,10 +30,10 @@ Basic Primary Object class for GRAMPS. # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib.tableobj import TableObject -from gen.lib.privacybase import PrivacyBase -from gen.lib.citationbase import CitationBase -from gen.lib.mediabase import MediaBase +from tableobj import TableObject +from privacybase import PrivacyBase +from citationbase import CitationBase +from mediabase import MediaBase #------------------------------------------------------------------------- # diff --git a/src/gen/lib/privsrcnote.py b/src/gen/lib/privsrcnote.py index d1df25281..248ba7c67 100644 --- a/src/gen/lib/privsrcnote.py +++ b/src/gen/lib/privsrcnote.py @@ -24,8 +24,8 @@ PrivateSourceNote class for GRAMPS. """ -from gen.lib.srcnote import SourceNote -from gen.lib.privacybase import PrivacyBase +from srcnote import SourceNote +from privacybase import PrivacyBase #------------------------------------------------------------------------- # diff --git a/src/gen/lib/repo.py b/src/gen/lib/repo.py index a7286940a..394b0d973 100644 --- a/src/gen/lib/repo.py +++ b/src/gen/lib/repo.py @@ -31,11 +31,11 @@ Repository object for GRAMPS. # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib.primaryobj import PrimaryObject -from gen.lib.notebase import NoteBase -from gen.lib.addressbase import AddressBase -from gen.lib.urlbase import UrlBase -from gen.lib.repotype import RepositoryType +from primaryobj import PrimaryObject +from notebase import NoteBase +from addressbase import AddressBase +from urlbase import UrlBase +from repotype import RepositoryType #------------------------------------------------------------------------- # diff --git a/src/gen/lib/reporef.py b/src/gen/lib/reporef.py index 53c7c7f60..2098133fc 100644 --- a/src/gen/lib/reporef.py +++ b/src/gen/lib/reporef.py @@ -30,12 +30,12 @@ Repository Reference class for GRAMPS # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib.secondaryobj import SecondaryObject -from gen.lib.privacybase import PrivacyBase -from gen.lib.notebase import NoteBase -from gen.lib.refbase import RefBase -from gen.lib.srcmediatype import SourceMediaType -from gen.lib.const import IDENTICAL, EQUAL, DIFFERENT +from secondaryobj import SecondaryObject +from privacybase import PrivacyBase +from notebase import NoteBase +from refbase import RefBase +from srcmediatype import SourceMediaType +from const import IDENTICAL, EQUAL, DIFFERENT #------------------------------------------------------------------------- # diff --git a/src/gen/lib/repotype.py b/src/gen/lib/repotype.py index 54db1fd59..d7aea67a2 100644 --- a/src/gen/lib/repotype.py +++ b/src/gen/lib/repotype.py @@ -29,14 +29,14 @@ Repository types. # Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ..ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib.grampstype import GrampsType +from grampstype import GrampsType class RepositoryType(GrampsType): diff --git a/src/gen/lib/researcher.py b/src/gen/lib/researcher.py index aa9016d37..863d5e703 100644 --- a/src/gen/lib/researcher.py +++ b/src/gen/lib/researcher.py @@ -29,7 +29,7 @@ Researcher information for GRAMPS. # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib.locationbase import LocationBase +from locationbase import LocationBase #------------------------------------------------------------------------- # diff --git a/src/gen/lib/secondaryobj.py b/src/gen/lib/secondaryobj.py index ffb32d41b..237b8bf1e 100644 --- a/src/gen/lib/secondaryobj.py +++ b/src/gen/lib/secondaryobj.py @@ -29,7 +29,7 @@ Secondary Object class for GRAMPS. # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib.baseobj import BaseObject +from baseobj import BaseObject #------------------------------------------------------------------------- # diff --git a/src/gen/lib/src.py b/src/gen/lib/src.py index d1cf3affc..eb1593fbf 100644 --- a/src/gen/lib/src.py +++ b/src/gen/lib/src.py @@ -31,11 +31,11 @@ Source object for GRAMPS. # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib.primaryobj import PrimaryObject -from gen.lib.mediabase import MediaBase -from gen.lib.notebase import NoteBase -from gen.lib.reporef import RepoRef -from gen.lib.const import DIFFERENT, EQUAL, IDENTICAL +from primaryobj import PrimaryObject +from mediabase import MediaBase +from notebase import NoteBase +from reporef import RepoRef +from const import DIFFERENT, EQUAL, IDENTICAL #------------------------------------------------------------------------- # diff --git a/src/gen/lib/srcmediatype.py b/src/gen/lib/srcmediatype.py index c4b2cb29f..d34cf1e8e 100644 --- a/src/gen/lib/srcmediatype.py +++ b/src/gen/lib/srcmediatype.py @@ -28,14 +28,14 @@ SourceMedia types. # Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ..ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib.grampstype import GrampsType +from grampstype import GrampsType class SourceMediaType(GrampsType): diff --git a/src/gen/lib/styledtext.py b/src/gen/lib/styledtext.py index 72ebb0f50..ed3d2d728 100644 --- a/src/gen/lib/styledtext.py +++ b/src/gen/lib/styledtext.py @@ -27,7 +27,7 @@ # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib.styledtexttag import StyledTextTag +from styledtexttag import StyledTextTag #------------------------------------------------------------------------- # diff --git a/src/gen/lib/styledtexttag.py b/src/gen/lib/styledtexttag.py index d3a5e0528..92ef4034e 100644 --- a/src/gen/lib/styledtexttag.py +++ b/src/gen/lib/styledtexttag.py @@ -27,7 +27,7 @@ # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib.styledtexttagtype import StyledTextTagType +from styledtexttagtype import StyledTextTagType #------------------------------------------------------------------------- # diff --git a/src/gen/lib/styledtexttagtype.py b/src/gen/lib/styledtexttagtype.py index 846812c39..54508688f 100644 --- a/src/gen/lib/styledtexttagtype.py +++ b/src/gen/lib/styledtexttagtype.py @@ -27,14 +27,14 @@ # Python modules # #------------------------------------------------------------------------ -from gen.ggettext import gettext as _ +from ..ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib.grampstype import GrampsType +from grampstype import GrampsType #------------------------------------------------------------------------- # diff --git a/src/gen/lib/surname.py b/src/gen/lib/surname.py index 73385d2ba..e831bdb73 100644 --- a/src/gen/lib/surname.py +++ b/src/gen/lib/surname.py @@ -29,9 +29,9 @@ Surname class for GRAMPS. # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib.secondaryobj import SecondaryObject -from gen.lib.nameorigintype import NameOriginType -from gen.lib.const import IDENTICAL, EQUAL, DIFFERENT +from secondaryobj import SecondaryObject +from nameorigintype import NameOriginType +from const import IDENTICAL, EQUAL, DIFFERENT #------------------------------------------------------------------------- # diff --git a/src/gen/lib/surnamebase.py b/src/gen/lib/surnamebase.py index 9c4a59b93..0a399060c 100644 --- a/src/gen/lib/surnamebase.py +++ b/src/gen/lib/surnamebase.py @@ -24,15 +24,15 @@ SurnameBase class for GRAMPS. """ -from gen.ggettext import gettext as _ +from ..ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib.surname import Surname -from gen.lib.const import IDENTICAL, EQUAL +from surname import Surname +from const import IDENTICAL, EQUAL #------------------------------------------------------------------------- # diff --git a/src/gen/lib/tableobj.py b/src/gen/lib/tableobj.py index 1872e889b..5b58e16ff 100644 --- a/src/gen/lib/tableobj.py +++ b/src/gen/lib/tableobj.py @@ -37,7 +37,7 @@ import locale # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib.baseobj import BaseObject +from baseobj import BaseObject #------------------------------------------------------------------------- # diff --git a/src/gen/lib/tag.py b/src/gen/lib/tag.py index fe6de8373..01219dd5c 100644 --- a/src/gen/lib/tag.py +++ b/src/gen/lib/tag.py @@ -29,7 +29,7 @@ Tag object for GRAMPS. # Gramps modules # #------------------------------------------------------------------------- -from gen.lib.tableobj import TableObject +from tableobj import TableObject #------------------------------------------------------------------------- # diff --git a/src/gen/lib/url.py b/src/gen/lib/url.py index 3a467e3ac..03310ac8e 100644 --- a/src/gen/lib/url.py +++ b/src/gen/lib/url.py @@ -38,10 +38,10 @@ from urlparse import urlparse # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib.secondaryobj import SecondaryObject -from gen.lib.privacybase import PrivacyBase -from gen.lib.urltype import UrlType -from gen.lib.const import IDENTICAL, EQUAL, DIFFERENT +from secondaryobj import SecondaryObject +from privacybase import PrivacyBase +from urltype import UrlType +from const import IDENTICAL, EQUAL, DIFFERENT #------------------------------------------------------------------------- # diff --git a/src/gen/lib/urlbase.py b/src/gen/lib/urlbase.py index 143664047..934e60846 100644 --- a/src/gen/lib/urlbase.py +++ b/src/gen/lib/urlbase.py @@ -29,8 +29,8 @@ UrlBase class for GRAMPS. # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib.url import Url -from gen.lib.const import IDENTICAL, EQUAL +from url import Url +from const import IDENTICAL, EQUAL #------------------------------------------------------------------------- # diff --git a/src/gen/lib/urltype.py b/src/gen/lib/urltype.py index b1ec37f03..55c0c59d3 100644 --- a/src/gen/lib/urltype.py +++ b/src/gen/lib/urltype.py @@ -29,14 +29,14 @@ URL types # Python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ..ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.lib.grampstype import GrampsType +from grampstype import GrampsType class UrlType(GrampsType): diff --git a/src/gen/plug/_docgenplugin.py b/src/gen/plug/_docgenplugin.py index 9c3c3c890..2f2f6c4c8 100644 --- a/src/gen/plug/_docgenplugin.py +++ b/src/gen/plug/_docgenplugin.py @@ -23,8 +23,8 @@ This module provides the Plugin class for document generator plugins. """ -from gen.plug import Plugin -from gen.plug.docgen import TextDoc, DrawDoc +from . import Plugin +from docgen import TextDoc, DrawDoc class DocGenPlugin(Plugin): """ diff --git a/src/gen/plug/_export.py b/src/gen/plug/_export.py index bd42e9bcc..cdccdce21 100644 --- a/src/gen/plug/_export.py +++ b/src/gen/plug/_export.py @@ -23,7 +23,7 @@ This module provides the Plugin class for export plugins. """ -from gen.plug import Plugin +from . import Plugin class ExportPlugin(Plugin): """ diff --git a/src/gen/plug/_gramplet.py b/src/gen/plug/_gramplet.py index edadeb670..63bb7ee0e 100644 --- a/src/gen/plug/_gramplet.py +++ b/src/gen/plug/_gramplet.py @@ -21,13 +21,13 @@ # $Id$ -from gen.config import config +from ..config import config if config.get('preferences.use-bsddb3'): import bsddb3 as bsddb else: import bsddb import types -from gen.ggettext import gettext as _ +from ..ggettext import gettext as _ import logging LOG = logging.getLogger(".Gramplets") @@ -395,7 +395,7 @@ class Gramplet(object): """ Add an option to the GUI gramplet. """ - from gui.plug import make_gui_option + from gramps.gui.plug import make_gui_option widget, label = make_gui_option( option, self.dbstate, self.uistate, self.track) self.option_dict.update({option.get_label(): [widget, option]}) diff --git a/src/gen/plug/_import.py b/src/gen/plug/_import.py index cb1b1af7c..11183c352 100644 --- a/src/gen/plug/_import.py +++ b/src/gen/plug/_import.py @@ -23,7 +23,7 @@ This module provides the Plugin class for import plugins. """ -from gen.plug import Plugin +from . import Plugin class ImportPlugin(Plugin): """ diff --git a/src/gen/plug/_manager.py b/src/gen/plug/_manager.py index 37609f960..531c4faa4 100644 --- a/src/gen/plug/_manager.py +++ b/src/gen/plug/_manager.py @@ -38,15 +38,15 @@ importers, exporters, quick reports, and document generators. import os import sys import re -from gen.ggettext import gettext as _ +from ..ggettext import gettext as _ #------------------------------------------------------------------------- # # GRAMPS modules # #------------------------------------------------------------------------- -from gen.config import config -from gen.plug import PluginRegister, ImportPlugin, ExportPlugin, DocGenPlugin +from ..config import config +from . import PluginRegister, ImportPlugin, ExportPlugin, DocGenPlugin #------------------------------------------------------------------------- # diff --git a/src/gen/plug/_options.py b/src/gen/plug/_options.py index 0657d3b55..7821ed229 100644 --- a/src/gen/plug/_options.py +++ b/src/gen/plug/_options.py @@ -51,8 +51,8 @@ except: # gramps modules # #------------------------------------------------------------------------- -from gen.utils.cast import get_type_converter -import gen +from ..utils.cast import get_type_converter +from menu import Menu #------------------------------------------------------------------------- # @@ -483,7 +483,7 @@ class MenuOptions(object): options to a menu. """ def __init__(self): - self.menu = gen.plug.menu.Menu() + self.menu = Menu() # Fill options_dict with report/tool defaults: self.options_dict = {} diff --git a/src/gen/plug/_pluginreg.py b/src/gen/plug/_pluginreg.py index 36b51cadc..3cfe15707 100644 --- a/src/gen/plug/_pluginreg.py +++ b/src/gen/plug/_pluginreg.py @@ -40,10 +40,10 @@ import traceback # GRAMPS modules # #------------------------------------------------------------------------- -from gen.const import VERSION as GRAMPSVERSION, VERSION_TUPLE -from gen.const import IMAGE_DIR -from gen.utils.trans import get_addon_translator -from gen.ggettext import gettext as _ +from ..const import VERSION as GRAMPSVERSION, VERSION_TUPLE +from ..const import IMAGE_DIR +from ..utils.trans import get_addon_translator +from ..ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gen/plug/docgen/graphdoc.py b/src/gen/plug/docgen/graphdoc.py index 2b7a04d33..f967565b1 100644 --- a/src/gen/plug/docgen/graphdoc.py +++ b/src/gen/plug/docgen/graphdoc.py @@ -42,12 +42,12 @@ import sys # GRAMPS modules # #------------------------------------------------------------------------------- -from gen.ggettext import gettext as _ -from gen.utils.file import search_for -from gen.plug.docgen import BaseDoc -from gen.plug.menu import NumberOption, TextOption, EnumeratedListOption, \ +from ...ggettext import gettext as _ +from ...utils.file import search_for +from . import BaseDoc +from ..menu import NumberOption, TextOption, EnumeratedListOption, \ BooleanOption -from gen.constfunc import win +from ...constfunc import win #------------------------------------------------------------------------- # diff --git a/src/gen/plug/docgen/stylesheet.py b/src/gen/plug/docgen/stylesheet.py index 6b6c78ddc..a8c8e842a 100644 --- a/src/gen/plug/docgen/stylesheet.py +++ b/src/gen/plug/docgen/stylesheet.py @@ -43,7 +43,7 @@ def escxml(string): # GRAMPS modules # #------------------------------------------------------------------------- -from gen.plug.utils import gformat, gfloat +from ..utils import gformat, gfloat from paragraphstyle import ParagraphStyle from fontstyle import FontStyle from tablestyle import TableStyle, TableCellStyle diff --git a/src/gen/plug/menu/_boolean.py b/src/gen/plug/menu/_boolean.py index 17910935e..7ab18272c 100644 --- a/src/gen/plug/menu/_boolean.py +++ b/src/gen/plug/menu/_boolean.py @@ -29,7 +29,7 @@ Option class representing a boolean (yes/no, true/false). # gramps modules # #------------------------------------------------------------------------- -from gen.plug.menu import Option +from . import Option #------------------------------------------------------------------------- # diff --git a/src/gen/plug/menu/_booleanlist.py b/src/gen/plug/menu/_booleanlist.py index 9f6d69f07..aefc9429a 100644 --- a/src/gen/plug/menu/_booleanlist.py +++ b/src/gen/plug/menu/_booleanlist.py @@ -28,7 +28,7 @@ Option class representing a list of boolean values. # gramps modules # #------------------------------------------------------------------------- -from gen.plug.menu import Option +from . import Option #------------------------------------------------------------------------- # diff --git a/src/gen/plug/menu/_color.py b/src/gen/plug/menu/_color.py index dbf729afd..ae5e2dc59 100644 --- a/src/gen/plug/menu/_color.py +++ b/src/gen/plug/menu/_color.py @@ -29,7 +29,7 @@ Option class representing a color. # gramps modules # #------------------------------------------------------------------------- -from gen.plug.menu import Option +from . import Option #------------------------------------------------------------------------- # diff --git a/src/gen/plug/menu/_destination.py b/src/gen/plug/menu/_destination.py index ae67da3f7..7e496652d 100644 --- a/src/gen/plug/menu/_destination.py +++ b/src/gen/plug/menu/_destination.py @@ -29,7 +29,7 @@ Option class representing a file destination. # gramps modules # #------------------------------------------------------------------------- -from gen.plug.menu import StringOption +from . import StringOption #------------------------------------------------------------------------- # diff --git a/src/gen/plug/menu/_enumeratedlist.py b/src/gen/plug/menu/_enumeratedlist.py index 6d44cba5a..6d917924c 100644 --- a/src/gen/plug/menu/_enumeratedlist.py +++ b/src/gen/plug/menu/_enumeratedlist.py @@ -29,7 +29,7 @@ Option class representing an enumerated list of possible values. # gramps modules # #------------------------------------------------------------------------- -from gen.plug.menu import Option +from . import Option #------------------------------------------------------------------------- # diff --git a/src/gen/plug/menu/_family.py b/src/gen/plug/menu/_family.py index 6a966e31f..c2f1fcc02 100644 --- a/src/gen/plug/menu/_family.py +++ b/src/gen/plug/menu/_family.py @@ -29,7 +29,7 @@ Option class representing a family. # gramps modules # #------------------------------------------------------------------------- -from gen.plug.menu import StringOption +from . import StringOption #------------------------------------------------------------------------- # diff --git a/src/gen/plug/menu/_filter.py b/src/gen/plug/menu/_filter.py index 677971fa4..93c92fce1 100644 --- a/src/gen/plug/menu/_filter.py +++ b/src/gen/plug/menu/_filter.py @@ -29,7 +29,7 @@ Option class representing a list of filters. # gramps modules # #------------------------------------------------------------------------- -from gen.plug.menu import EnumeratedListOption +from . import EnumeratedListOption #------------------------------------------------------------------------- # diff --git a/src/gen/plug/menu/_media.py b/src/gen/plug/menu/_media.py index 472a272ec..3ad9f80d6 100644 --- a/src/gen/plug/menu/_media.py +++ b/src/gen/plug/menu/_media.py @@ -29,7 +29,7 @@ Option class representing a media object. # gramps modules # #------------------------------------------------------------------------- -from gen.plug.menu import StringOption +from . import StringOption #------------------------------------------------------------------------- # diff --git a/src/gen/plug/menu/_note.py b/src/gen/plug/menu/_note.py index fc0bd6d59..e0527b233 100644 --- a/src/gen/plug/menu/_note.py +++ b/src/gen/plug/menu/_note.py @@ -29,7 +29,7 @@ Option class representing a string. # gramps modules # #------------------------------------------------------------------------- -from gen.plug.menu import StringOption +from . import StringOption #------------------------------------------------------------------------- # diff --git a/src/gen/plug/menu/_number.py b/src/gen/plug/menu/_number.py index 8dcb77805..83b592c1e 100644 --- a/src/gen/plug/menu/_number.py +++ b/src/gen/plug/menu/_number.py @@ -29,7 +29,7 @@ Option class representing a number. # gramps modules # #------------------------------------------------------------------------- -from gen.plug.menu import Option +from . import Option #------------------------------------------------------------------------- # diff --git a/src/gen/plug/menu/_option.py b/src/gen/plug/menu/_option.py index 978e86cf6..fbf6cd154 100644 --- a/src/gen/plug/menu/_option.py +++ b/src/gen/plug/menu/_option.py @@ -29,7 +29,7 @@ The base option class for all other option classes. # gramps modules # #------------------------------------------------------------------------- -from gen.utils.callback import Callback +from ...utils.callback import Callback #------------------------------------------------------------------------- # diff --git a/src/gen/plug/menu/_person.py b/src/gen/plug/menu/_person.py index a7c41b139..676f2cd65 100644 --- a/src/gen/plug/menu/_person.py +++ b/src/gen/plug/menu/_person.py @@ -29,7 +29,7 @@ Option class representing a person. # gramps modules # #------------------------------------------------------------------------- -from gen.plug.menu import StringOption +from . import StringOption #------------------------------------------------------------------------- # diff --git a/src/gen/plug/menu/_personlist.py b/src/gen/plug/menu/_personlist.py index 3e56a23ed..9605d95e9 100644 --- a/src/gen/plug/menu/_personlist.py +++ b/src/gen/plug/menu/_personlist.py @@ -29,8 +29,7 @@ Option class representing a list of people. # gramps modules # #------------------------------------------------------------------------- -from gen.plug.menu import Option - +from . import Option #------------------------------------------------------------------------- # diff --git a/src/gen/plug/menu/_placelist.py b/src/gen/plug/menu/_placelist.py index 3a67d1848..d3e2dcab4 100644 --- a/src/gen/plug/menu/_placelist.py +++ b/src/gen/plug/menu/_placelist.py @@ -29,7 +29,7 @@ Option class representing a list of places. # gramps modules # #------------------------------------------------------------------------- -from gen.plug.menu import Option +from . import Option #------------------------------------------------------------------------- # diff --git a/src/gen/plug/menu/_string.py b/src/gen/plug/menu/_string.py index ec6064d73..84afff0bf 100644 --- a/src/gen/plug/menu/_string.py +++ b/src/gen/plug/menu/_string.py @@ -29,7 +29,7 @@ Option class representing a string. # gramps modules # #------------------------------------------------------------------------- -from gen.plug.menu import Option +from . import Option #------------------------------------------------------------------------- # diff --git a/src/gen/plug/menu/_style.py b/src/gen/plug/menu/_style.py index 69e31f3d7..dff476ca6 100644 --- a/src/gen/plug/menu/_style.py +++ b/src/gen/plug/menu/_style.py @@ -29,8 +29,8 @@ Option class representing a document style. # gramps modules # #------------------------------------------------------------------------- -from gen.plug.menu import EnumeratedListOption -from gen.plug.docgen import StyleSheetList +from . import EnumeratedListOption +from ..docgen import StyleSheetList #------------------------------------------------------------------------- # diff --git a/src/gen/plug/menu/_surnamecolor.py b/src/gen/plug/menu/_surnamecolor.py index 8b835cf27..2ae600d4a 100644 --- a/src/gen/plug/menu/_surnamecolor.py +++ b/src/gen/plug/menu/_surnamecolor.py @@ -29,7 +29,7 @@ Option class representing color/surname mappings. # gramps modules # #------------------------------------------------------------------------- -from gen.plug.menu import Option +from . import Option #------------------------------------------------------------------------- # diff --git a/src/gen/plug/menu/_text.py b/src/gen/plug/menu/_text.py index 1acd357e3..92163c72c 100644 --- a/src/gen/plug/menu/_text.py +++ b/src/gen/plug/menu/_text.py @@ -29,7 +29,7 @@ Option class representing a block of text. # gramps modules # #------------------------------------------------------------------------- -from gen.plug.menu import Option +from . import Option #------------------------------------------------------------------------- # diff --git a/src/gen/plug/utils.py b/src/gen/plug/utils.py index 84f5be950..5d9012246 100644 --- a/src/gen/plug/utils.py +++ b/src/gen/plug/utils.py @@ -38,10 +38,10 @@ import os # Gramps modules # #------------------------------------------------------------------------- -from gen.plug._pluginreg import make_environment -from gen.const import USER_PLUGINS, VERSION_TUPLE -from gen.utils.file import get_unicode_path_from_file_chooser -from gen.ggettext import gettext as _ +from _pluginreg import make_environment +from ..const import USER_PLUGINS, VERSION_TUPLE +from ..utils.file import get_unicode_path_from_file_chooser +from ..ggettext import gettext as _ #------------------------------------------------------------------------- # diff --git a/src/gen/utils/alive.py b/src/gen/utils/alive.py index 983a30b2f..907c46345 100644 --- a/src/gen/utils/alive.py +++ b/src/gen/utils/alive.py @@ -40,10 +40,10 @@ LOG = logging.getLogger(".gen.utils.alive") # Gramps modules # #------------------------------------------------------------------------- -from gen.display.name import displayer as name_displayer -import gen.lib -from gen.errors import DatabaseError -from gen.ggettext import sgettext as _ +from ..display.name import displayer as name_displayer +from ..lib.date import Date, Today +from ..errors import DatabaseError +from ..ggettext import sgettext as _ #------------------------------------------------------------------------- # @@ -106,7 +106,7 @@ class ProbablyAlive(object): if death_ref and death_ref.get_role().is_primary(): if death_ref: death = self.db.get_event_from_handle(death_ref.ref) - if death and death.get_date_object().get_start_date() != gen.lib.Date.EMPTY: + if death and death.get_date_object().get_start_date() != Date.EMPTY: death_date = death.get_date_object() # Look for Cause Of Death, Burial or Cremation events. @@ -124,7 +124,7 @@ class ProbablyAlive(object): if not birth_date: if birth_ref and birth_ref.get_role().is_primary(): birth = self.db.get_event_from_handle(birth_ref.ref) - if birth and birth.get_date_object().get_start_date() != gen.lib.Date.EMPTY: + if birth and birth.get_date_object().get_start_date() != Date.EMPTY: birth_date = birth.get_date_object() # Look for Baptism, etc events. @@ -170,24 +170,24 @@ class ProbablyAlive(object): ev = self.db.get_event_from_handle(ev_ref.ref) if ev and ev.type.is_birth(): dobj = ev.get_date_object() - if dobj.get_start_date() != gen.lib.Date.EMPTY: + if dobj.get_start_date() != Date.EMPTY: # if sibling birth date too far away, then not alive: year = dobj.get_year() if year != 0: # sibling birth date - return (gen.lib.Date().copy_ymd(year - self.MAX_SIB_AGE_DIFF), - gen.lib.Date().copy_ymd(year - self.MAX_SIB_AGE_DIFF + self.MAX_AGE_PROB_ALIVE), + return (Date().copy_ymd(year - self.MAX_SIB_AGE_DIFF), + Date().copy_ymd(year - self.MAX_SIB_AGE_DIFF + self.MAX_AGE_PROB_ALIVE), _("sibling birth date"), child) elif ev and ev.type.is_death(): dobj = ev.get_date_object() - if dobj.get_start_date() != gen.lib.Date.EMPTY: + if dobj.get_start_date() != Date.EMPTY: # if sibling death date too far away, then not alive: year = dobj.get_year() if year != 0: # sibling death date - return (gen.lib.Date().copy_ymd(year - self.MAX_SIB_AGE_DIFF - self.MAX_AGE_PROB_ALIVE), - gen.lib.Date().copy_ymd(year - self.MAX_SIB_AGE_DIFF - self.MAX_AGE_PROB_ALIVE + return (Date().copy_ymd(year - self.MAX_SIB_AGE_DIFF - self.MAX_AGE_PROB_ALIVE), + Date().copy_ymd(year - self.MAX_SIB_AGE_DIFF - self.MAX_AGE_PROB_ALIVE + self.MAX_AGE_PROB_ALIVE), _("sibling death date"), child) @@ -196,24 +196,24 @@ class ProbablyAlive(object): ev = self.db.get_event_from_handle(ev_ref.ref) if ev and ev.type.is_birth_fallback(): dobj = ev.get_date_object() - if dobj.get_start_date() != gen.lib.Date.EMPTY: + if dobj.get_start_date() != Date.EMPTY: # if sibling birth date too far away, then not alive: year = dobj.get_year() if year != 0: # sibling birth date - return (gen.lib.Date().copy_ymd(year - self.MAX_SIB_AGE_DIFF), - gen.lib.Date().copy_ymd(year - self.MAX_SIB_AGE_DIFF + self.MAX_AGE_PROB_ALIVE), + return (Date().copy_ymd(year - self.MAX_SIB_AGE_DIFF), + Date().copy_ymd(year - self.MAX_SIB_AGE_DIFF + self.MAX_AGE_PROB_ALIVE), _("sibling birth-related date"), child) elif ev and ev.type.is_death_fallback(): dobj = ev.get_date_object() - if dobj.get_start_date() != gen.lib.Date.EMPTY: + if dobj.get_start_date() != Date.EMPTY: # if sibling death date too far away, then not alive: year = dobj.get_year() if year != 0: # sibling death date - return (gen.lib.Date().copy_ymd(year - self.MAX_SIB_AGE_DIFF - self.MAX_AGE_PROB_ALIVE), - gen.lib.Date().copy_ymd(year - self.MAX_SIB_AGE_DIFF - self.MAX_AGE_PROB_ALIVE + self.MAX_AGE_PROB_ALIVE), + return (Date().copy_ymd(year - self.MAX_SIB_AGE_DIFF - self.MAX_AGE_PROB_ALIVE), + Date().copy_ymd(year - self.MAX_SIB_AGE_DIFF - self.MAX_AGE_PROB_ALIVE + self.MAX_AGE_PROB_ALIVE), _("sibling death-related date"), child) @@ -246,8 +246,8 @@ class ProbablyAlive(object): other = self.db.get_person_from_handle(father_handle) elif person.handle == father_handle and mother_handle: other = self.db.get_person_from_handle(mother_handle) - return (gen.lib.Date().copy_ymd(year - self.AVG_GENERATION_GAP), - gen.lib.Date().copy_ymd(year - self.AVG_GENERATION_GAP + + return (Date().copy_ymd(year - self.AVG_GENERATION_GAP), + Date().copy_ymd(year - self.AVG_GENERATION_GAP + self.MAX_AGE_PROB_ALIVE), _("event with spouse"), other) @@ -268,8 +268,8 @@ class ProbablyAlive(object): if child_birth_ref: child_birth = self.db.get_event_from_handle(child_birth_ref.ref) dobj = child_birth.get_date_object() - if dobj.get_start_date() != gen.lib.Date.EMPTY: - d = gen.lib.Date(dobj) + if dobj.get_start_date() != Date.EMPTY: + d = Date(dobj) val = d.get_start_date() val = d.get_year() - years d.set_year(val) @@ -280,7 +280,7 @@ class ProbablyAlive(object): if child_death_ref: child_death = self.db.get_event_from_handle(child_death_ref.ref) dobj = child_death.get_date_object() - if dobj.get_start_date() != gen.lib.Date.EMPTY: + if dobj.get_start_date() != Date.EMPTY: return (dobj.copy_offset_ymd(- self.AVG_GENERATION_GAP), dobj.copy_offset_ymd(- self.AVG_GENERATION_GAP + self.MAX_AGE_PROB_ALIVE), _("descendant death date"), @@ -293,8 +293,8 @@ class ProbablyAlive(object): ev = self.db.get_event_from_handle(ev_ref.ref) if ev and ev.type.is_birth_fallback(): dobj = ev.get_date_object() - if dobj.get_start_date() != gen.lib.Date.EMPTY: - d = gen.lib.Date(dobj) + if dobj.get_start_date() != Date.EMPTY: + d = Date(dobj) val = d.get_start_date() val = d.get_year() - years d.set_year(val) @@ -304,7 +304,7 @@ class ProbablyAlive(object): elif ev and ev.type.is_death_fallback(): dobj = ev.get_date_object() - if dobj.get_start_date() != gen.lib.Date.EMPTY: + if dobj.get_start_date() != Date.EMPTY: return (dobj.copy_offset_ymd(- self.AVG_GENERATION_GAP), dobj.copy_offset_ymd(- self.AVG_GENERATION_GAP + self.MAX_AGE_PROB_ALIVE), _("descendant death-related date"), @@ -341,7 +341,7 @@ class ProbablyAlive(object): father_birth = self.db.get_event_from_handle( father_birth_ref.ref) dobj = father_birth.get_date_object() - if dobj.get_start_date() != gen.lib.Date.EMPTY: + if dobj.get_start_date() != Date.EMPTY: return (dobj.copy_offset_ymd(- year), dobj.copy_offset_ymd(- year + self.MAX_AGE_PROB_ALIVE), _("ancestor birth date"), @@ -351,7 +351,7 @@ class ProbablyAlive(object): father_death = self.db.get_event_from_handle( father_death_ref.ref) dobj = father_death.get_date_object() - if dobj.get_start_date() != gen.lib.Date.EMPTY: + if dobj.get_start_date() != Date.EMPTY: return (dobj.copy_offset_ymd(- year - self.MAX_AGE_PROB_ALIVE), dobj.copy_offset_ymd(- year - self.MAX_AGE_PROB_ALIVE + self.MAX_AGE_PROB_ALIVE), _("ancestor death date"), @@ -362,7 +362,7 @@ class ProbablyAlive(object): ev = self.db.get_event_from_handle(ev_ref.ref) if ev and ev.type.is_birth_fallback(): dobj = ev.get_date_object() - if dobj.get_start_date() != gen.lib.Date.EMPTY: + if dobj.get_start_date() != Date.EMPTY: return (dobj.copy_offset_ymd(- year), dobj.copy_offset_ymd(- year + self.MAX_AGE_PROB_ALIVE), _("ancestor birth-related date"), @@ -370,7 +370,7 @@ class ProbablyAlive(object): elif ev and ev.type.is_death_fallback(): dobj = ev.get_date_object() - if dobj.get_start_date() != gen.lib.Date.EMPTY: + if dobj.get_start_date() != Date.EMPTY: return (dobj.copy_offset_ymd(- year - self.MAX_AGE_PROB_ALIVE), dobj.copy_offset_ymd(- year - self.MAX_AGE_PROB_ALIVE + self.MAX_AGE_PROB_ALIVE), _("ancestor death-related date"), @@ -387,7 +387,7 @@ class ProbablyAlive(object): if mother_birth_ref and mother_birth_ref.get_role().is_primary(): mother_birth = self.db.get_event_from_handle(mother_birth_ref.ref) dobj = mother_birth.get_date_object() - if dobj.get_start_date() != gen.lib.Date.EMPTY: + if dobj.get_start_date() != Date.EMPTY: return (dobj.copy_offset_ymd(- year), dobj.copy_offset_ymd(- year + self.MAX_AGE_PROB_ALIVE), _("ancestor birth date"), @@ -397,7 +397,7 @@ class ProbablyAlive(object): mother_death = self.db.get_event_from_handle( mother_death_ref.ref) dobj = mother_death.get_date_object() - if dobj.get_start_date() != gen.lib.Date.EMPTY: + if dobj.get_start_date() != Date.EMPTY: return (dobj.copy_offset_ymd(- year - self.MAX_AGE_PROB_ALIVE), dobj.copy_offset_ymd(- year - self.MAX_AGE_PROB_ALIVE + self.MAX_AGE_PROB_ALIVE), _("ancestor death date"), @@ -408,7 +408,7 @@ class ProbablyAlive(object): ev = self.db.get_event_from_handle(ev_ref.ref) if ev and ev.type.is_birth_fallback(): dobj = ev.get_date_object() - if dobj.get_start_date() != gen.lib.Date.EMPTY: + if dobj.get_start_date() != Date.EMPTY: return (dobj.copy_offset_ymd(- year), dobj.copy_offset_ymd(- year + self.MAX_AGE_PROB_ALIVE), _("ancestor birth-related date"), @@ -416,7 +416,7 @@ class ProbablyAlive(object): elif ev and ev.type.is_death_fallback(): dobj = ev.get_date_object() - if dobj.get_start_date() != gen.lib.Date.EMPTY: + if dobj.get_start_date() != Date.EMPTY: return (dobj.copy_offset_ymd(- year - self.MAX_AGE_PROB_ALIVE), dobj.copy_offset_ymd(- year - self.MAX_AGE_PROB_ALIVE + self.MAX_AGE_PROB_ALIVE), _("ancestor death-related date"), @@ -474,7 +474,7 @@ def probably_alive(person, db, avg_generation_gap) birth, death, explain, relative = pb.probably_alive_range(person) if current_date is None: - current_date = gen.lib.date.Today() + current_date = Today() if not birth or not death: # no evidence, must consider alive return (True, None, None, _("no evidence"), None) diff --git a/src/gen/utils/cast.py b/src/gen/utils/cast.py index 01d106a96..eaf0283fb 100644 --- a/src/gen/utils/cast.py +++ b/src/gen/utils/cast.py @@ -38,7 +38,7 @@ import locale # Gramps modules # #------------------------------------------------------------------------- -from gen.datehandler import codeset +from ..datehandler import codeset """ strxfrm needs it's unicode argument correctly cast before used. diff --git a/src/gen/utils/db.py b/src/gen/utils/db.py index e60caec05..061f6bd17 100644 --- a/src/gen/utils/db.py +++ b/src/gen/utils/db.py @@ -36,9 +36,10 @@ LOG = logging.getLogger(".gui.utils.db") # Gramps modules # #------------------------------------------------------------------------- -import gen.lib -from gen.display.name import displayer as name_displayer -from gen.ggettext import sgettext as _ +from ..lib.nameorigintype import NameOriginType +from ..lib.surname import Surname +from ..display.name import displayer as name_displayer +from ..ggettext import sgettext as _ #------------------------------------------------------------------------- # @@ -168,7 +169,7 @@ def get_event_ref(db, family, event_type): """ Return a reference to a primary family event of the given event type. """ - from gen.lib import EventRoleType + from ..lib.eventroletype import EventRoleType for event_ref in family.get_event_ref_list(): event = db.get_event_from_handle(event_ref.ref) if (event and event.get_type() == event_type and @@ -181,7 +182,7 @@ def get_primary_event_ref_list(db, family): """ Return a reference to the primary events of the family. """ - from gen.lib import EventRoleType + from ..lib.eventroletype import EventRoleType retval = [] for event_ref in family.get_event_ref_list(): event = db.get_event_from_handle(event_ref.ref) @@ -196,7 +197,8 @@ def get_marriage_or_fallback(db, family, format=None): Get a MARRIAGE event from a family, or fallback to an alternative event type. """ - from gen.lib import EventType, EventRoleType + from ..lib.eventroletype import EventRoleType + from ..lib.eventtype import EventType marriage_ref = get_event_ref(db, family, EventType.MARRIAGE) if marriage_ref: # regular marriage found event = db.get_event_from_handle(marriage_ref.ref) @@ -220,7 +222,8 @@ def get_divorce_or_fallback(db, family, format=None): Get a DIVORCE event from a family, or fallback to an alternative event type. """ - from gen.lib import EventType, EventRoleType + from ..lib.eventroletype import EventRoleType + from ..lib.eventtype import EventType divorce_ref = get_event_ref(db, family, EventType.DIVORCE) if divorce_ref: # regular marriage found event = db.get_event_from_handle(divorce_ref.ref) @@ -492,14 +495,14 @@ def preset_name(basepers, name, sibling=False): prim = False for surn in primname.get_surname_list(): if (not sibling) and (surn.get_origintype().value in - [gen.lib.NameOriginType.PATRONYMIC, - gen.lib.NameOriginType.MATRONYMIC]): + [NameOriginType.PATRONYMIC, + NameOriginType.MATRONYMIC]): continue - surnlist.append(gen.lib.Surname(source=surn)) + surnlist.append(Surname(source=surn)) if surn.primary: prim=True if not surnlist: - surnlist = [gen.lib.Surname()] + surnlist = [Surname()] name.set_surname_list(surnlist) if not prim: name.set_primary_surname(0) diff --git a/src/gen/utils/file.py b/src/gen/utils/file.py index a213f325f..cac073b31 100644 --- a/src/gen/utils/file.py +++ b/src/gen/utils/file.py @@ -43,8 +43,8 @@ LOG = logging.getLogger(".gen.utils.file") # Gramps modules # #------------------------------------------------------------------------- -from gen.constfunc import win, mac -from gen.const import TEMP_DIR, USER_HOME +from ..constfunc import win, mac +from ..const import TEMP_DIR, USER_HOME #------------------------------------------------------------------------- # diff --git a/src/gen/utils/id.py b/src/gen/utils/id.py index bbce3f451..7494cdd01 100644 --- a/src/gen/utils/id.py +++ b/src/gen/utils/id.py @@ -41,7 +41,7 @@ import uuid # Gramps modules # #------------------------------------------------------------------------- -from gen.const import GRAMPS_UUID +from ..const import GRAMPS_UUID #------------------------------------------------------------------------- # diff --git a/src/gen/utils/place.py b/src/gen/utils/place.py index 5f0765283..ff68783d3 100644 --- a/src/gen/utils/place.py +++ b/src/gen/utils/place.py @@ -29,7 +29,7 @@ # Standard python modules # #------------------------------------------------------------------------- -from gen.ggettext import gettext as _ +from ..ggettext import gettext as _ import math #------------------------------------------------------------------------- diff --git a/src/gen/utils/trans.py b/src/gen/utils/trans.py index 2674af0ee..1ffa9a833 100644 --- a/src/gen/utils/trans.py +++ b/src/gen/utils/trans.py @@ -41,8 +41,8 @@ import logging # gramps modules # #------------------------------------------------------------------------- -from gen.const import PREFIXDIR, ROOT_DIR -from gen.constfunc import mac +from ..const import PREFIXDIR, ROOT_DIR +from ..constfunc import mac #------------------------------------------------------------------------- # # Public Constants diff --git a/src/gramps.py b/src/grampsapp.py similarity index 98% rename from src/gramps.py rename to src/grampsapp.py index 00d670852..e3fa63cf5 100644 --- a/src/gramps.py +++ b/src/grampsapp.py @@ -450,7 +450,11 @@ def run(): from cli.grampscli import startcli startcli(error, argpars) -errors = run() -if errors and isinstance(errors, list): - for error in errors: - logging.warning(error[0] + error[1]) +def main(): + errors = run() + if errors and isinstance(errors, list): + for error in errors: + logging.warning(error[0] + error[1]) + +if __name__ == '__main__': + main() \ No newline at end of file diff --git a/src/gui/__init__.py b/src/gui/__init__.py index d57dbac86..1eceb5191 100644 --- a/src/gui/__init__.py +++ b/src/gui/__init__.py @@ -27,4 +27,4 @@ Package init for the gui package. # DO NOT IMPORT METHODS/CLASSES FROM src/gui HERE ! Only __all__ __all__ = [ "editors", "filters", "logger", "merge", "selectors", "views", - "widgets" ] + "widgets"] diff --git a/src/gui/grampsgui.py b/src/gui/grampsgui.py index b0b034e0b..994b863a3 100644 --- a/src/gui/grampsgui.py +++ b/src/gui/grampsgui.py @@ -223,6 +223,7 @@ class Gramps(object): def __init__(self, argparser): from gen.dbstate import DbState + import viewmanager from viewmanager import ViewManager from cli.arghandler import ArgHandler from gui.tipofday import TipOfDay diff --git a/src/gui/user.py b/src/gui/user.py index b2b653011..936ef48a3 100644 --- a/src/gui/user.py +++ b/src/gui/user.py @@ -40,7 +40,6 @@ import gen.user from gui.utils import ProgressMeter from gui.dialog import (WarningDialog, ErrorDialog, DBErrorDialog, InfoDialog) - #------------------------------------------------------------------------- # # User class diff --git a/src/gui/utils.py b/src/gui/utils.py index 2980cabb3..7563cae2e 100644 --- a/src/gui/utils.py +++ b/src/gui/utils.py @@ -31,7 +31,7 @@ Utility functions that depend on GUI components or for GUI components #------------------------------------------------------------------------- import os import sys -from gen.ggettext import gettext as _ +from gramps.gen.ggettext import gettext as _ # gtk is not included here, because this file is currently imported # by code that needs to run without the DISPLAY variable (eg, in # the cli only). @@ -48,9 +48,9 @@ from gi.repository import PangoCairo # Gramps modules # #------------------------------------------------------------------------- -import gen.lib -from gen.constfunc import has_display, is_quartz, mac, win -from gen.config import config +from gramps.gen.lib.person import Person +from gramps.gen.constfunc import has_display, is_quartz, mac, win +from gramps.gen.config import config #------------------------------------------------------------------------- # @@ -411,27 +411,27 @@ def is_right_click(event): if event.button == 3: return True -def color_graph_box(alive=False, gender=gen.lib.Person.MALE): +def color_graph_box(alive=False, gender=Person.MALE): """ Returns based on the config the color for graph boxes in hex If gender is None, an empty box is assumed Return type: tuple (hex color fill, hex color border) """ - if gender == gen.lib.Person.MALE: + if gender == Person.MALE: if alive: return (config.get('preferences.color-gender-male-alive'), config.get('preferences.bordercolor-gender-male-alive')) else: return (config.get('preferences.color-gender-male-death'), config.get('preferences.bordercolor-gender-male-death')) - elif gender == gen.lib.Person.FEMALE: + elif gender == Person.FEMALE: if alive: return (config.get('preferences.color-gender-female-alive'), config.get('preferences.bordercolor-gender-female-alive')) else: return (config.get('preferences.color-gender-female-death'), config.get('preferences.bordercolor-gender-female-death')) - elif gender == gen.lib.Person.UNKNOWN: + elif gender == Person.UNKNOWN: if alive: return (config.get('preferences.color-gender-unknown-alive'), config.get('preferences.bordercolor-gender-unknown-alive')) diff --git a/src/gui/viewmanager.py b/src/gui/viewmanager.py index 77ca67786..b4e1012f2 100644 --- a/src/gui/viewmanager.py +++ b/src/gui/viewmanager.py @@ -42,8 +42,6 @@ import datetime from gen.ggettext import sgettext as _ from gen.ggettext import ngettext from cStringIO import StringIO -from collections import defaultdict -from gui.user import User import sys import posixpath @@ -68,6 +66,7 @@ from gi.repository import Gtk # #------------------------------------------------------------------------- from cli.grampscli import CLIManager +from gui.user import User from gui.plug import tool from gen.plug import (START, END) from gen.plug import REPORT @@ -263,7 +262,6 @@ def get_count(addon_update_list, category): # ViewManager # #------------------------------------------------------------------------- - class ViewManager(CLIManager): """ Overview