diff --git a/src/gen/filters/rules/_hascitationbase.py b/src/gen/filters/rules/_hascitationbase.py index 4cacef650..8d0b8fdc6 100644 --- a/src/gen/filters/rules/_hascitationbase.py +++ b/src/gen/filters/rules/_hascitationbase.py @@ -34,7 +34,7 @@ from gen.ggettext import gettext as _ # #------------------------------------------------------------------------- import gen.datehandler -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/_hasnotebase.py b/src/gen/filters/rules/_hasnotebase.py index b4a123216..ec57d24e3 100755 --- a/src/gen/filters/rules/_hasnotebase.py +++ b/src/gen/filters/rules/_hasnotebase.py @@ -36,7 +36,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # "Objects having notes" diff --git a/src/gen/filters/rules/_hassourcebase.py b/src/gen/filters/rules/_hassourcebase.py index 6926d6942..0481a1cce 100644 --- a/src/gen/filters/rules/_hassourcebase.py +++ b/src/gen/filters/rules/_hassourcebase.py @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/_hassourcecountbase.py b/src/gen/filters/rules/_hassourcecountbase.py index 7bf47019c..2ffacbeb4 100755 --- a/src/gen/filters/rules/_hassourcecountbase.py +++ b/src/gen/filters/rules/_hassourcecountbase.py @@ -35,7 +35,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # "Objects having sources" diff --git a/src/gen/filters/rules/_matchessourceconfidencebase.py b/src/gen/filters/rules/_matchessourceconfidencebase.py index 1540b431b..505466b72 100644 --- a/src/gen/filters/rules/_matchessourceconfidencebase.py +++ b/src/gen/filters/rules/_matchessourceconfidencebase.py @@ -36,7 +36,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # "Confidence level" diff --git a/src/gen/filters/rules/event/_hasdata.py b/src/gen/filters/rules/event/_hasdata.py index e5c329202..5024dbbab 100644 --- a/src/gen/filters/rules/event/_hasdata.py +++ b/src/gen/filters/rules/event/_hasdata.py @@ -34,7 +34,7 @@ from gen.ggettext import gettext as _ #------------------------------------------------------------------------- import gen.datehandler from gen.lib import EventType -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/family/_hasreltype.py b/src/gen/filters/rules/family/_hasreltype.py index ffa4e5e9f..3d0445fd1 100644 --- a/src/gen/filters/rules/family/_hasreltype.py +++ b/src/gen/filters/rules/family/_hasreltype.py @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # #------------------------------------------------------------------------- from gen.lib import FamilyRelType -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/family/_isbookmarked.py b/src/gen/filters/rules/family/_isbookmarked.py index ad9b084fc..121f331e8 100644 --- a/src/gen/filters/rules/family/_isbookmarked.py +++ b/src/gen/filters/rules/family/_isbookmarked.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/media/_hasmedia.py b/src/gen/filters/rules/media/_hasmedia.py index 94bb5cb08..e64c05489 100644 --- a/src/gen/filters/rules/media/_hasmedia.py +++ b/src/gen/filters/rules/media/_hasmedia.py @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # #------------------------------------------------------------------------- import gen.datehandler -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/note/_hasnote.py b/src/gen/filters/rules/note/_hasnote.py index 5fe3850ad..9c2614628 100644 --- a/src/gen/filters/rules/note/_hasnote.py +++ b/src/gen/filters/rules/note/_hasnote.py @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # #------------------------------------------------------------------------- from gen.lib import NoteType -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_disconnected.py b/src/gen/filters/rules/person/_disconnected.py index 3c4fbb966..04cca789a 100644 --- a/src/gen/filters/rules/person/_disconnected.py +++ b/src/gen/filters/rules/person/_disconnected.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_everyone.py b/src/gen/filters/rules/person/_everyone.py index 1e924154b..42e70ee1e 100644 --- a/src/gen/filters/rules/person/_everyone.py +++ b/src/gen/filters/rules/person/_everyone.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_familywithincompleteevent.py b/src/gen/filters/rules/person/_familywithincompleteevent.py index 294fe8c1e..9c15d304d 100644 --- a/src/gen/filters/rules/person/_familywithincompleteevent.py +++ b/src/gen/filters/rules/person/_familywithincompleteevent.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # "Families with incomplete events" diff --git a/src/gen/filters/rules/person/_hasalternatename.py b/src/gen/filters/rules/person/_hasalternatename.py index 57422af72..e7cadf583 100644 --- a/src/gen/filters/rules/person/_hasalternatename.py +++ b/src/gen/filters/rules/person/_hasalternatename.py @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_hasbirth.py b/src/gen/filters/rules/person/_hasbirth.py index 1d4c6545c..c45e9a4b4 100644 --- a/src/gen/filters/rules/person/_hasbirth.py +++ b/src/gen/filters/rules/person/_hasbirth.py @@ -34,7 +34,7 @@ from gen.ggettext import gettext as _ #------------------------------------------------------------------------- import gen.datehandler from gen.lib import EventType,EventRoleType -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_hascommonancestorwith.py b/src/gen/filters/rules/person/_hascommonancestorwith.py index 8439c14fc..ebecd124b 100644 --- a/src/gen/filters/rules/person/_hascommonancestorwith.py +++ b/src/gen/filters/rules/person/_hascommonancestorwith.py @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # #------------------------------------------------------------------------- from Utils import for_each_ancestor -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_hasdeath.py b/src/gen/filters/rules/person/_hasdeath.py index ddd302b4c..dad28b4fb 100644 --- a/src/gen/filters/rules/person/_hasdeath.py +++ b/src/gen/filters/rules/person/_hasdeath.py @@ -34,7 +34,7 @@ from gen.ggettext import gettext as _ #------------------------------------------------------------------------- import gen.datehandler from gen.lib import EventType,EventRoleType -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_hasfamilyattribute.py b/src/gen/filters/rules/person/_hasfamilyattribute.py index e8b8a584b..ed7b695e4 100644 --- a/src/gen/filters/rules/person/_hasfamilyattribute.py +++ b/src/gen/filters/rules/person/_hasfamilyattribute.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_hasfamilyevent.py b/src/gen/filters/rules/person/_hasfamilyevent.py index e3acef992..2763b2af5 100644 --- a/src/gen/filters/rules/person/_hasfamilyevent.py +++ b/src/gen/filters/rules/person/_hasfamilyevent.py @@ -34,7 +34,7 @@ from gen.ggettext import gettext as _ #------------------------------------------------------------------------- import gen.datehandler from gen.lib import EventType -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_hasnameorigintype.py b/src/gen/filters/rules/person/_hasnameorigintype.py index 66a2e31dd..02c57cc7f 100644 --- a/src/gen/filters/rules/person/_hasnameorigintype.py +++ b/src/gen/filters/rules/person/_hasnameorigintype.py @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule from gen.lib import NameOriginType #------------------------------------------------------------------------- diff --git a/src/gen/filters/rules/person/_hasnametype.py b/src/gen/filters/rules/person/_hasnametype.py index 9a779b9fe..ee5f7f5f2 100644 --- a/src/gen/filters/rules/person/_hasnametype.py +++ b/src/gen/filters/rules/person/_hasnametype.py @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule from gen.lib import NameType #------------------------------------------------------------------------- diff --git a/src/gen/filters/rules/person/_hasnickname.py b/src/gen/filters/rules/person/_hasnickname.py index 58d2c5203..fc8514145 100644 --- a/src/gen/filters/rules/person/_hasnickname.py +++ b/src/gen/filters/rules/person/_hasnickname.py @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_hasrelationship.py b/src/gen/filters/rules/person/_hasrelationship.py index b159c4e5f..4b960497d 100644 --- a/src/gen/filters/rules/person/_hasrelationship.py +++ b/src/gen/filters/rules/person/_hasrelationship.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule from gen.lib import FamilyRelType #------------------------------------------------------------------------- diff --git a/src/gen/filters/rules/person/_hassourceof.py b/src/gen/filters/rules/person/_hassourceof.py index 86a7a6041..dcfbb8f91 100644 --- a/src/gen/filters/rules/person/_hassourceof.py +++ b/src/gen/filters/rules/person/_hassourceof.py @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_hastextmatchingsubstringof.py b/src/gen/filters/rules/person/_hastextmatchingsubstringof.py index 77b23a92c..1bb924aac 100644 --- a/src/gen/filters/rules/person/_hastextmatchingsubstringof.py +++ b/src/gen/filters/rules/person/_hastextmatchingsubstringof.py @@ -36,7 +36,7 @@ LOG = logging.getLogger(".citationfilter") # #------------------------------------------------------------------------- from Utils import get_source_and_citation_referents -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # "HasTextMatchingSubstringOf" diff --git a/src/gen/filters/rules/person/_hasunknowngender.py b/src/gen/filters/rules/person/_hasunknowngender.py index a832e3a4b..decd37437 100644 --- a/src/gen/filters/rules/person/_hasunknowngender.py +++ b/src/gen/filters/rules/person/_hasunknowngender.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule from gen.lib import Person #------------------------------------------------------------------------- diff --git a/src/gen/filters/rules/person/_havealtfamilies.py b/src/gen/filters/rules/person/_havealtfamilies.py index 571abf6df..cc7047bb2 100644 --- a/src/gen/filters/rules/person/_havealtfamilies.py +++ b/src/gen/filters/rules/person/_havealtfamilies.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule from gen.lib import ChildRefType #------------------------------------------------------------------------- diff --git a/src/gen/filters/rules/person/_havechildren.py b/src/gen/filters/rules/person/_havechildren.py index 0d7d160e3..22d0de781 100644 --- a/src/gen/filters/rules/person/_havechildren.py +++ b/src/gen/filters/rules/person/_havechildren.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # "People with children" diff --git a/src/gen/filters/rules/person/_incompletenames.py b/src/gen/filters/rules/person/_incompletenames.py index ef841b0d6..4b07b26ec 100644 --- a/src/gen/filters/rules/person/_incompletenames.py +++ b/src/gen/filters/rules/person/_incompletenames.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_isancestorof.py b/src/gen/filters/rules/person/_isancestorof.py index 1f314aabd..3b2e0756b 100644 --- a/src/gen/filters/rules/person/_isancestorof.py +++ b/src/gen/filters/rules/person/_isancestorof.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_isbookmarked.py b/src/gen/filters/rules/person/_isbookmarked.py index 11ababfdc..b3d604ab0 100644 --- a/src/gen/filters/rules/person/_isbookmarked.py +++ b/src/gen/filters/rules/person/_isbookmarked.py @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_isdefaultperson.py b/src/gen/filters/rules/person/_isdefaultperson.py index d383e9526..d24d53c90 100644 --- a/src/gen/filters/rules/person/_isdefaultperson.py +++ b/src/gen/filters/rules/person/_isdefaultperson.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_isdescendantfamilyof.py b/src/gen/filters/rules/person/_isdescendantfamilyof.py index e510d97bf..fd7308d1c 100644 --- a/src/gen/filters/rules/person/_isdescendantfamilyof.py +++ b/src/gen/filters/rules/person/_isdescendantfamilyof.py @@ -36,7 +36,7 @@ except NameError: # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_isdescendantof.py b/src/gen/filters/rules/person/_isdescendantof.py index 73cee94ea..eb211145e 100644 --- a/src/gen/filters/rules/person/_isdescendantof.py +++ b/src/gen/filters/rules/person/_isdescendantof.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_isduplicatedancestorof.py b/src/gen/filters/rules/person/_isduplicatedancestorof.py index 8facf53d1..e0bdff590 100644 --- a/src/gen/filters/rules/person/_isduplicatedancestorof.py +++ b/src/gen/filters/rules/person/_isduplicatedancestorof.py @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_isfemale.py b/src/gen/filters/rules/person/_isfemale.py index 286ca48a1..9db0825f0 100644 --- a/src/gen/filters/rules/person/_isfemale.py +++ b/src/gen/filters/rules/person/_isfemale.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule from gen.lib import Person #------------------------------------------------------------------------- diff --git a/src/gen/filters/rules/person/_islessthannthgenerationancestorof.py b/src/gen/filters/rules/person/_islessthannthgenerationancestorof.py index 60327e004..8a5474382 100644 --- a/src/gen/filters/rules/person/_islessthannthgenerationancestorof.py +++ b/src/gen/filters/rules/person/_islessthannthgenerationancestorof.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_islessthannthgenerationancestorofbookmarked.py b/src/gen/filters/rules/person/_islessthannthgenerationancestorofbookmarked.py index d43b4b4d7..562e40421 100644 --- a/src/gen/filters/rules/person/_islessthannthgenerationancestorofbookmarked.py +++ b/src/gen/filters/rules/person/_islessthannthgenerationancestorofbookmarked.py @@ -37,7 +37,7 @@ except: # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_islessthannthgenerationancestorofdefaultperson.py b/src/gen/filters/rules/person/_islessthannthgenerationancestorofdefaultperson.py index 9a1955f36..d280abf61 100644 --- a/src/gen/filters/rules/person/_islessthannthgenerationancestorofdefaultperson.py +++ b/src/gen/filters/rules/person/_islessthannthgenerationancestorofdefaultperson.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_islessthannthgenerationdescendantof.py b/src/gen/filters/rules/person/_islessthannthgenerationdescendantof.py index 0ba4c92e9..db9ac9179 100644 --- a/src/gen/filters/rules/person/_islessthannthgenerationdescendantof.py +++ b/src/gen/filters/rules/person/_islessthannthgenerationdescendantof.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_ismale.py b/src/gen/filters/rules/person/_ismale.py index 50f55a96b..53b69105d 100644 --- a/src/gen/filters/rules/person/_ismale.py +++ b/src/gen/filters/rules/person/_ismale.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule from gen.lib import Person #------------------------------------------------------------------------- diff --git a/src/gen/filters/rules/person/_ismorethannthgenerationancestorof.py b/src/gen/filters/rules/person/_ismorethannthgenerationancestorof.py index 71a87068e..c54033bc6 100644 --- a/src/gen/filters/rules/person/_ismorethannthgenerationancestorof.py +++ b/src/gen/filters/rules/person/_ismorethannthgenerationancestorof.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_ismorethannthgenerationdescendantof.py b/src/gen/filters/rules/person/_ismorethannthgenerationdescendantof.py index 2fbf356bc..37f62702a 100644 --- a/src/gen/filters/rules/person/_ismorethannthgenerationdescendantof.py +++ b/src/gen/filters/rules/person/_ismorethannthgenerationdescendantof.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_isrelatedwith.py b/src/gen/filters/rules/person/_isrelatedwith.py index 70d63d075..889db927b 100644 --- a/src/gen/filters/rules/person/_isrelatedwith.py +++ b/src/gen/filters/rules/person/_isrelatedwith.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_iswitness.py b/src/gen/filters/rules/person/_iswitness.py index c41882d96..beab03689 100644 --- a/src/gen/filters/rules/person/_iswitness.py +++ b/src/gen/filters/rules/person/_iswitness.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule from gen.lib import EventRoleType, EventType #------------------------------------------------------------------------- diff --git a/src/gen/filters/rules/person/_matchidof.py b/src/gen/filters/rules/person/_matchidof.py index 44f06f43b..e2666dd2a 100644 --- a/src/gen/filters/rules/person/_matchidof.py +++ b/src/gen/filters/rules/person/_matchidof.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_missingparent.py b/src/gen/filters/rules/person/_missingparent.py index 62dc2d833..8b9abef56 100644 --- a/src/gen/filters/rules/person/_missingparent.py +++ b/src/gen/filters/rules/person/_missingparent.py @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._rule import Rule +from gen.filters.rules 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 e04ff2608..8712355ae 100644 --- a/src/gen/filters/rules/person/_multiplemarriages.py +++ b/src/gen/filters/rules/person/_multiplemarriages.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._rule import Rule +from gen.filters.rules 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 56d7ad305..a63c3a7b9 100644 --- a/src/gen/filters/rules/person/_nevermarried.py +++ b/src/gen/filters/rules/person/_nevermarried.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._rule import Rule +from gen.filters.rules 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 eff7a1895..3514f91e2 100644 --- a/src/gen/filters/rules/person/_nobirthdate.py +++ b/src/gen/filters/rules/person/_nobirthdate.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._rule import Rule +from gen.filters.rules 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 1374d08db..1002cfec6 100644 --- a/src/gen/filters/rules/person/_nodeathdate.py +++ b/src/gen/filters/rules/person/_nodeathdate.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # "People without a death date" diff --git a/src/gen/filters/rules/person/_personwithincompleteevent.py b/src/gen/filters/rules/person/_personwithincompleteevent.py index a265bcb2e..58c28d9fd 100644 --- a/src/gen/filters/rules/person/_personwithincompleteevent.py +++ b/src/gen/filters/rules/person/_personwithincompleteevent.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._rule import Rule +from gen.filters.rules 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 3983b52b8..1e7e14158 100644 --- a/src/gen/filters/rules/person/_probablyalive.py +++ b/src/gen/filters/rules/person/_probablyalive.py @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # #------------------------------------------------------------------------- from Utils import probably_alive -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule import gen.datehandler #------------------------------------------------------------------------- diff --git a/src/gen/filters/rules/person/_regexpname.py b/src/gen/filters/rules/person/_regexpname.py index 46e6dacb3..b2e0b362f 100644 --- a/src/gen/filters/rules/person/_regexpname.py +++ b/src/gen/filters/rules/person/_regexpname.py @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule import re #------------------------------------------------------------------------- diff --git a/src/gen/filters/rules/person/_relationshippathbetween.py b/src/gen/filters/rules/person/_relationshippathbetween.py index 1d7eb9d44..ccdd0d5fc 100644 --- a/src/gen/filters/rules/person/_relationshippathbetween.py +++ b/src/gen/filters/rules/person/_relationshippathbetween.py @@ -32,7 +32,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_relationshippathbetweenbookmarks.py b/src/gen/filters/rules/person/_relationshippathbetweenbookmarks.py index 0b8f5c2a4..af658ba01 100644 --- a/src/gen/filters/rules/person/_relationshippathbetweenbookmarks.py +++ b/src/gen/filters/rules/person/_relationshippathbetweenbookmarks.py @@ -35,7 +35,7 @@ except NameError: # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/person/_searchname.py b/src/gen/filters/rules/person/_searchname.py index 771133bbc..20305ab45 100644 --- a/src/gen/filters/rules/person/_searchname.py +++ b/src/gen/filters/rules/person/_searchname.py @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/place/_hasnolatorlon.py b/src/gen/filters/rules/place/_hasnolatorlon.py index e5e851822..7a8124588 100644 --- a/src/gen/filters/rules/place/_hasnolatorlon.py +++ b/src/gen/filters/rules/place/_hasnolatorlon.py @@ -34,7 +34,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/place/_hasplace.py b/src/gen/filters/rules/place/_hasplace.py index 4bfc89a14..ff53b589a 100644 --- a/src/gen/filters/rules/place/_hasplace.py +++ b/src/gen/filters/rules/place/_hasplace.py @@ -34,7 +34,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- # diff --git a/src/gen/filters/rules/place/_inlatlonneighborhood.py b/src/gen/filters/rules/place/_inlatlonneighborhood.py index 3cfd091bd..9768f2f4f 100644 --- a/src/gen/filters/rules/place/_inlatlonneighborhood.py +++ b/src/gen/filters/rules/place/_inlatlonneighborhood.py @@ -34,7 +34,7 @@ from gen.ggettext import gettext as _ # GRAMPS modules # #------------------------------------------------------------------------- -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule import PlaceUtils #------------------------------------------------------------------------- diff --git a/src/gen/filters/rules/repository/_hasrepo.py b/src/gen/filters/rules/repository/_hasrepo.py index edec7a1e6..30b9ae8b7 100644 --- a/src/gen/filters/rules/repository/_hasrepo.py +++ b/src/gen/filters/rules/repository/_hasrepo.py @@ -33,7 +33,7 @@ from gen.ggettext import gettext as _ # #------------------------------------------------------------------------- from gen.lib import RepositoryType -from gen.filters.rules._rule import Rule +from gen.filters.rules import Rule #------------------------------------------------------------------------- #