From 8b8cbd50c971dea0e8a91b7c8812dca4078db750 Mon Sep 17 00:00:00 2001 From: Martin Hawlisch Date: Mon, 27 Nov 2006 16:11:38 +0000 Subject: [PATCH] * src/Filters/Rules/Person/_HasCompleteRecord.py: Use new marker API * src/RelLib/_Person.py (get_complete_flag): Remove old unused API * src/RelLib/_Family.py (get/set_complete_flag): Remove old unused API svn: r7720 --- gramps2/ChangeLog | 5 +++++ .../Rules/Person/_HasCompleteRecord.py | 3 ++- gramps2/src/RelLib/_Family.py | 22 ------------------- gramps2/src/RelLib/_Person.py | 7 ------ 4 files changed, 7 insertions(+), 30 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index f97730b6f..fb05a25a8 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,8 @@ +2006-11-27 Martin Hawlisch + * src/Filters/Rules/Person/_HasCompleteRecord.py: Use new marker API + * src/RelLib/_Person.py (get_complete_flag): Remove old unused API + * src/RelLib/_Family.py (get/set_complete_flag): Remove old unused API + 2006-11-27 Don Allingham * configure.in: change version number diff --git a/gramps2/src/Filters/Rules/Person/_HasCompleteRecord.py b/gramps2/src/Filters/Rules/Person/_HasCompleteRecord.py index ecd09cb49..1c5c5bb08 100644 --- a/gramps2/src/Filters/Rules/Person/_HasCompleteRecord.py +++ b/gramps2/src/Filters/Rules/Person/_HasCompleteRecord.py @@ -33,6 +33,7 @@ from gettext import gettext as _ # #------------------------------------------------------------------------- from Filters.Rules._Rule import Rule +from RelLib import MarkerType #------------------------------------------------------------------------- # @@ -47,4 +48,4 @@ class HasCompleteRecord(Rule): description = _('Matches all people whose records are complete') def apply(self,db,person): - return person.get_complete_flag() == 1 + return person.get_marker() == MarkerType.COMPLETE diff --git a/gramps2/src/RelLib/_Family.py b/gramps2/src/RelLib/_Family.py index 7cffcfa54..2fe5483df 100644 --- a/gramps2/src/RelLib/_Family.py +++ b/gramps2/src/RelLib/_Family.py @@ -251,28 +251,6 @@ class Family(PrimaryObject,SourceBase,NoteBase,MediaBase,AttributeBase, """ return self.get_sourcref_child_list() + self.source_list - def set_complete_flag(self,val): - """ - Sets or clears the complete flag, which is used to indicate that the - Family's data is considered to be complete. - - @param val: True indicates the Family object is considered to be - complete - @type val: bool - """ - self.complete = val - - def get_complete_flag(self): - """ - Returns the complete flag, which is used to indicate that the - Family's data is considered to be complete. - - @return: True indicates that the Family's record is considered to - be complete. - @rtype: bool - """ - return self.complete - def set_relationship(self,relationship_type): """ Sets the relationship type between the people identified as the diff --git a/gramps2/src/RelLib/_Person.py b/gramps2/src/RelLib/_Person.py index d179ac22d..59112aea1 100644 --- a/gramps2/src/RelLib/_Person.py +++ b/gramps2/src/RelLib/_Person.py @@ -334,13 +334,6 @@ class Person(PrimaryObject,SourceBase,NoteBase,MediaBase, return self.get_sourcref_child_list() + self.source_list \ + self.event_ref_list - def get_complete_flag(self): - warn( "Use get_marker instead of get_complete_flag", - DeprecationWarning, 2) - # Wrapper for old API - # remove when transitition done. - return self.marker == MarkerType.COMPLETE - def set_primary_name(self, name): """ Sets the primary name of the Person to the specified