diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index a410d078b..fc3276418 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,7 @@ +2006-04-13 Martin Hawlisch + * src/RelLib/*: fix different typos. + * src/DataViews/_FamilyView.py: adapt changes in RelLib + 2006-04-12 Alex Roitman * src/NameDisplay.py: Add constants to number name components. * src/PeopleModel.py: Correct constants. diff --git a/gramps2/src/DataViews/_FamilyView.py b/gramps2/src/DataViews/_FamilyView.py index c1623abb8..8c99f44e1 100644 --- a/gramps2/src/DataViews/_FamilyView.py +++ b/gramps2/src/DataViews/_FamilyView.py @@ -254,7 +254,7 @@ class FamilyView(PageView.PersonNavView): self.row = 5 family_handle_list = person.get_parent_family_handle_list() if family_handle_list: - for (family_handle, mrel, frel) in family_handle_list: + for family_handle in family_handle_list: if family_handle: self.write_parents(family_handle) else: @@ -639,11 +639,11 @@ class FamilyView(PageView.PersonNavView): if not self.write_marriage(family): self.write_relationship(family) - child_list = family.get_child_handle_list() + child_list = family.get_child_ref_list() label = _("Children") if child_list: - for child in child_list: - self.write_child(label, child) + for child_ref in child_list: + self.write_child(label, child_ref.ref) label = u"" self.row += 1 @@ -732,4 +732,3 @@ class FamilyView(PageView.PersonNavView): def change_to(self, obj, handle): self.dbstate.change_active_handle(handle) - diff --git a/gramps2/src/RelLib/_Attribute.py b/gramps2/src/RelLib/_Attribute.py index 459172bf5..c6e2afbb3 100644 --- a/gramps2/src/RelLib/_Attribute.py +++ b/gramps2/src/RelLib/_Attribute.py @@ -83,7 +83,7 @@ class Attribute(BaseObject,PrivacyBase,SourceBase,NoteBase): def unserialize(self,data): (privacy,source_list,note,self.type,self.value) = data - PrivateBase.unserialize(self,privacy) + PrivacyBase.unserialize(self,privacy) SourceBase.unserialize(self,source_list) NoteBase.unserialize(self,note) return self diff --git a/gramps2/src/RelLib/_ChildRef.py b/gramps2/src/RelLib/_ChildRef.py index 373731808..acda200f3 100644 --- a/gramps2/src/RelLib/_ChildRef.py +++ b/gramps2/src/RelLib/_ChildRef.py @@ -80,7 +80,7 @@ class ChildRef(BaseObject,PrivacyBase,SourceBase,NoteBase,RefBase): def unserialize(self,data): (privacy,source_list,note,ref,self.frel,self.mrel) = data - PrivateBase.unserialize(self,privacy) + PrivacyBase.unserialize(self,privacy) SourceBase.unserialize(self,source_list) NoteBase.unserialize(self,note) RefBase.unserialize(self,ref) diff --git a/gramps2/src/RelLib/_Event.py b/gramps2/src/RelLib/_Event.py index 1eecbbfe5..eeeb24ab7 100644 --- a/gramps2/src/RelLib/_Event.py +++ b/gramps2/src/RelLib/_Event.py @@ -168,7 +168,7 @@ class Event(PrimaryObject,SourceBase,NoteBase,MediaBase,DateBase,PlaceBase): DateBase.unserialize(self,date) MediaBase.unserialize(self,media_list) SourceBase.unserialize(self,source_list) - Note.unserialize(self,note) + NoteBase.unserialize(self,note) def _has_handle_reference(self,classname,handle): if classname == 'Place': diff --git a/gramps2/src/RelLib/_EventRef.py b/gramps2/src/RelLib/_EventRef.py index 5b5ff58c2..d74888c1b 100644 --- a/gramps2/src/RelLib/_EventRef.py +++ b/gramps2/src/RelLib/_EventRef.py @@ -82,7 +82,7 @@ class EventRef(BaseObject,PrivacyBase,NoteBase,RefBase): return ( PrivacyBase.serialize(self), NoteBase.serialize(self), - Refbase.serialize(self), + RefBase.serialize(self), self.role ) diff --git a/gramps2/src/RelLib/_Family.py b/gramps2/src/RelLib/_Family.py index 8eb46c9fe..dd14d1187 100644 --- a/gramps2/src/RelLib/_Family.py +++ b/gramps2/src/RelLib/_Family.py @@ -121,7 +121,7 @@ class Family(PrimaryObject,SourceBase,NoteBase,MediaBase,AttributeBase, lds_seal = self.lds_seal.serialize() return (self.handle, self.gramps_id, self.father_handle, self.mother_handle, - [cr.serialize for cr in self.child_ref_list], + [cr.serialize() for cr in self.child_ref_list], self.type, [er.serialize() for er in self.event_ref_list], MediaBase.serialize(self), @@ -375,7 +375,7 @@ class Family(PrimaryObject,SourceBase,NoteBase,MediaBase,AttributeBase, @param person_handle: L{Person} database handle @type person_handle: str """ - if child_ref and not isinstance(childref,ChildRef): + if child_ref and not isinstance(child_ref,ChildRef): raise ValueError("expecting ChildRef instance") self.child_ref_list.append(child_ref) diff --git a/gramps2/src/RelLib/_MediaRef.py b/gramps2/src/RelLib/_MediaRef.py index 25922e8ca..8aef2fb21 100644 --- a/gramps2/src/RelLib/_MediaRef.py +++ b/gramps2/src/RelLib/_MediaRef.py @@ -63,12 +63,12 @@ class MediaRef(BaseObject,PrivacyBase,SourceBase,NoteBase,RefBase, SourceBase.serialize(self), NoteBase.serialize(self), AttributeBase.serialize(self), - Refbase.serialize(self), + RefBase.serialize(self), self.rect) def unserialize(self,data): (privacy,source_list,note,attribute_list,ref,self.rect) = data - PrivateBase.unserialize(self,privacy) + PrivacyBase.unserialize(self,privacy) SourceBase.unserialize(self,source_list) NoteBase.unserialize(self,note) AttributeBase.unserialize(self,attribute_list) diff --git a/gramps2/src/RelLib/_Name.py b/gramps2/src/RelLib/_Name.py index 95e4ca266..f3d5915d3 100644 --- a/gramps2/src/RelLib/_Name.py +++ b/gramps2/src/RelLib/_Name.py @@ -74,7 +74,7 @@ class Name(BaseObject,PrivacyBase,SourceBase,NoteBase,DateBase): self.first_name,self.surname,self.suffix,self.title, self.type,self.prefix,self.patronymic,self.sname, self.group_as,self.sort_as,self.display_as) = data - PrivateBase.unserialize(self,privacy) + PrivacyBase.unserialize(self,privacy) SourceBase.unserialize(self,source_list) NoteBase.unserialize(self,note) DateBase.unserialize(self,date) diff --git a/gramps2/src/RelLib/_PersonRef.py b/gramps2/src/RelLib/_PersonRef.py index c958a65bb..72498a598 100644 --- a/gramps2/src/RelLib/_PersonRef.py +++ b/gramps2/src/RelLib/_PersonRef.py @@ -69,7 +69,7 @@ class PersonRef(BaseObject,PrivacyBase,SourceBase,NoteBase,RefBase): def unserialize(self,data): (privacy,source_list,note,ref,self.rel) = data - PrivateBase.unserialize(self,privacy) + PrivacyBase.unserialize(self,privacy) SourceBase.unserialize(self,source_list) NoteBase.unserialize(self,note) RefBase.unserialize(self,ref) diff --git a/gramps2/src/RelLib/_RepoRef.py b/gramps2/src/RelLib/_RepoRef.py index 2733834a6..95c443a8d 100644 --- a/gramps2/src/RelLib/_RepoRef.py +++ b/gramps2/src/RelLib/_RepoRef.py @@ -73,7 +73,7 @@ class RepoRef(BaseObject,NoteBase,RefBase): def serialize(self): return ( NoteBase.serialize(self), - Refbase.serialize(self), + RefBase.serialize(self), self.call_number,self.media_type) def unserialize(self,data): diff --git a/gramps2/src/RelLib/_SourceRef.py b/gramps2/src/RelLib/_SourceRef.py index e42f8fa29..8ed9665b6 100644 --- a/gramps2/src/RelLib/_SourceRef.py +++ b/gramps2/src/RelLib/_SourceRef.py @@ -72,7 +72,7 @@ class SourceRef(BaseObject,DateBase,PrivacyBase,NoteBase,RefBase): PrivacyBase.serialize(self), NoteBase.serialize(self), self.confidence, - Refbase.serialize(self), + RefBase.serialize(self), self.page,self.text) def unserialize(self,data):