GEPS008: Correct Rule import in filters

svn: r19783

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
 
 #-------------------------------------------------------------------------
 #

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"

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
 
 #-------------------------------------------------------------------------
 #

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"

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"

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
 
 #-------------------------------------------------------------------------
 #

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
 
 #-------------------------------------------------------------------------
 #

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
 
 #-------------------------------------------------------------------------
 #

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
 
 #-------------------------------------------------------------------------
 #

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
 
 #-------------------------------------------------------------------------
 #

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
 
 #-------------------------------------------------------------------------
 #

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
 
 #-------------------------------------------------------------------------
 #

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"

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
 
 #-------------------------------------------------------------------------
 #

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
 
 #-------------------------------------------------------------------------
 #

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
 
 #-------------------------------------------------------------------------
 #

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
 
 #-------------------------------------------------------------------------
 #

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
 
 #-------------------------------------------------------------------------
 #

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
 
 #-------------------------------------------------------------------------
 #

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
 
 #-------------------------------------------------------------------------

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
 
 #-------------------------------------------------------------------------

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
 
 #-------------------------------------------------------------------------
 #

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
 
 #-------------------------------------------------------------------------

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
 
 #-------------------------------------------------------------------------
 #

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"

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
 
 #-------------------------------------------------------------------------

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
 
 #-------------------------------------------------------------------------

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"

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
 
 #-------------------------------------------------------------------------
 #

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
 
 #-------------------------------------------------------------------------
 #

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
 
 #-------------------------------------------------------------------------
 #

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
 
 #-------------------------------------------------------------------------
 #

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
 
 #-------------------------------------------------------------------------
 #

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
 
 #-------------------------------------------------------------------------
 #

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
 
 #-------------------------------------------------------------------------
 #

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
 
 #-------------------------------------------------------------------------

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
 
 #-------------------------------------------------------------------------
 #

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
 
 #-------------------------------------------------------------------------
 #

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
 
 #-------------------------------------------------------------------------
 #

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
 
 #-------------------------------------------------------------------------
 #

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
 
 #-------------------------------------------------------------------------

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
 
 #-------------------------------------------------------------------------
 #

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
 
 #-------------------------------------------------------------------------
 #

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
 
 #-------------------------------------------------------------------------
 #

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
 
 #-------------------------------------------------------------------------

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
 
 #-------------------------------------------------------------------------
 #

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"

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"

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"

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"

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"

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"

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
 
 #-------------------------------------------------------------------------

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
 
 #-------------------------------------------------------------------------

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
 
 #-------------------------------------------------------------------------
 #

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
 
 #-------------------------------------------------------------------------
 #

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
 
 #-------------------------------------------------------------------------
 #

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
 
 #-------------------------------------------------------------------------
 #

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
 
 #-------------------------------------------------------------------------
 #

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
 
 #-------------------------------------------------------------------------

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
 
 #-------------------------------------------------------------------------
 #