From abdda6106d3020a0bad44a808a3a2eaf4f2070b3 Mon Sep 17 00:00:00 2001
From: Don Allingham <don@gramps-project.org>
Date: Tue, 28 Aug 2007 11:47:22 +0000
Subject: [PATCH] 2007-08-28  Don Allingham  <don@gramps-project.org> 	*
 src/RelLib/_Person.py (Person.__init__): fix unserialize

svn: r8883
---
 ChangeLog             |  3 +++
 src/RelLib/_Person.py | 35 +++++++++++++++++------------------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 958b71b45..84ed1baf6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2007-08-28  Don Allingham  <don@gramps-project.org>
+	* src/RelLib/_Person.py (Person.__init__): fix unserialize
+
 2007-08-27  Benny Malengier <bm@cage.ugent.be> 
 	* src/glade/edit_person.glade: add event box for context menu
 	* src/Editors/_EditPerson.py : add context menu, feature req #946
diff --git a/src/RelLib/_Person.py b/src/RelLib/_Person.py
index 63c25bc16..bdf509cf8 100644
--- a/src/RelLib/_Person.py
+++ b/src/RelLib/_Person.py
@@ -84,26 +84,25 @@ class Person(SourceBase, NoteBase, AttributeBase, MediaBase,
         data items have empty or null values, including the database
         handle.
         """
+        PrimaryObject.__init__(self)
+        SourceBase.__init__(self)
+        NoteBase.__init__(self)
+        MediaBase.__init__(self)
+        AttributeBase.__init__(self)
+        AddressBase.__init__(self)
+        UrlBase.__init__(self)
+        LdsOrdBase.__init__(self)
+        self.primary_name = Name()
+        self.event_ref_list = []
+        self.family_list = []
+        self.parent_family_list = []
+        self.alternate_names = []
+        self.person_ref_list = []
+        self.gender = Person.UNKNOWN
+        self.death_ref_index = -1
+        self.birth_ref_index = -1
         if data:
             self.unserialize(data)
-        else:
-            PrimaryObject.__init__(self)
-            SourceBase.__init__(self)
-            NoteBase.__init__(self)
-            MediaBase.__init__(self)
-            AttributeBase.__init__(self)
-            AddressBase.__init__(self)
-            UrlBase.__init__(self)
-            LdsOrdBase.__init__(self)
-            self.primary_name = Name()
-            self.event_ref_list = []
-            self.family_list = []
-            self.parent_family_list = []
-            self.alternate_names = []
-            self.person_ref_list = []
-            self.gender = Person.UNKNOWN
-            self.death_ref_index = -1
-            self.birth_ref_index = -1
         
         # We hold a reference to the GrampsDB so that we can maintain
         # its genderStats.  It doesn't get set here, but from