svn: r6323
This commit is contained in:
Alex Roitman 2006-04-13 03:58:20 +00:00
parent cfb57b1be0
commit 58285333e8
4 changed files with 14 additions and 5 deletions

View File

@ -29,6 +29,7 @@ Address class for GRAMPS
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from _BaseObject import BaseObject
from _PrivacyBase import PrivacyBase from _PrivacyBase import PrivacyBase
from _SourceBase import SourceBase from _SourceBase import SourceBase
from _NoteBase import NoteBase from _NoteBase import NoteBase
@ -40,12 +41,14 @@ from _LocationBase import LocationBase
# Address for Person/Repository # Address for Person/Repository
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
class Address(PrivacyBase,SourceBase,NoteBase,DateBase,LocationBase): class Address(BaseObject,PrivacyBase,SourceBase,NoteBase,DateBase,
LocationBase):
"""Provides address information.""" """Provides address information."""
def __init__(self,source=None): def __init__(self,source=None):
"""Creates a new Address instance, copying from the source """Creates a new Address instance, copying from the source
if provided""" if provided"""
BaseObject.__init__(self)
PrivacyBase.__init__(self,source) PrivacyBase.__init__(self,source)
SourceBase.__init__(self,source) SourceBase.__init__(self,source)
NoteBase.__init__(self,source) NoteBase.__init__(self,source)

View File

@ -36,6 +36,7 @@ from warnings import warn
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from _BaseObject import BaseObject
from _PrivacyBase import PrivacyBase from _PrivacyBase import PrivacyBase
from _SourceBase import SourceBase from _SourceBase import SourceBase
from _NoteBase import NoteBase from _NoteBase import NoteBase
@ -45,7 +46,7 @@ from _NoteBase import NoteBase
# Attribute for Person/Family/MediaObject/MediaRef # Attribute for Person/Family/MediaObject/MediaRef
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
class Attribute(PrivacyBase,SourceBase,NoteBase): class Attribute(BaseObject,PrivacyBase,SourceBase,NoteBase):
"""Provides a simple key/value pair for describing properties. Used """Provides a simple key/value pair for describing properties. Used
by the Person and Family objects to store descriptive information.""" by the Person and Family objects to store descriptive information."""
@ -62,6 +63,7 @@ class Attribute(PrivacyBase,SourceBase,NoteBase):
""" """
Creates a new Attribute object, copying from the source if provided. Creates a new Attribute object, copying from the source if provided.
""" """
BaseObject.__init__(self)
PrivacyBase.__init__(self,source) PrivacyBase.__init__(self,source)
SourceBase.__init__(self,source) SourceBase.__init__(self,source)
NoteBase.__init__(self,source) NoteBase.__init__(self,source)

View File

@ -29,6 +29,7 @@ LDS Ordinance class for GRAMPS
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from _BaseObject import BaseObject
from _SourceBase import SourceBase from _SourceBase import SourceBase
from _NoteBase import NoteBase from _NoteBase import NoteBase
from _DateBase import DateBase from _DateBase import DateBase
@ -40,7 +41,7 @@ from _PrivacyBase import PrivacyBase
# LDS Ordinance class # LDS Ordinance class
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
class LdsOrd(SourceBase,NoteBase,DateBase,PlaceBase,PrivacyBase): class LdsOrd(BaseObject,SourceBase,NoteBase,DateBase,PlaceBase,PrivacyBase):
""" """
Class that contains information about LDS Ordinances. LDS Class that contains information about LDS Ordinances. LDS
ordinances are similar to events, but have very specific additional ordinances are similar to events, but have very specific additional
@ -71,6 +72,7 @@ class LdsOrd(SourceBase,NoteBase,DateBase,PlaceBase,PrivacyBase):
def __init__(self,source=None): def __init__(self,source=None):
"""Creates a LDS Ordinance instance""" """Creates a LDS Ordinance instance"""
BaseObject.__init__(self)
SourceBase.__init__(self,source) SourceBase.__init__(self,source)
NoteBase.__init__(self,source) NoteBase.__init__(self,source)
DateBase.__init__(self,source) DateBase.__init__(self,source)

View File

@ -36,6 +36,7 @@ from warnings import warn
# GRAMPS modules # GRAMPS modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from _BaseObject import BaseObject
from _PrivacyBase import PrivacyBase from _PrivacyBase import PrivacyBase
from _SourceBase import SourceBase from _SourceBase import SourceBase
from _NoteBase import NoteBase from _NoteBase import NoteBase
@ -46,7 +47,7 @@ from _DateBase import DateBase
# Personal Name # Personal Name
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
class Name(PrivacyBase,SourceBase,NoteBase,DateBase): class Name(BaseObject,PrivacyBase,SourceBase,NoteBase,DateBase):
""" """
Provides name information about a person. Provides name information about a person.
@ -67,6 +68,7 @@ class Name(PrivacyBase,SourceBase,NoteBase,DateBase):
def __init__(self,source=None,data=None): def __init__(self,source=None,data=None):
"""creates a new Name instance, copying from the source if provided""" """creates a new Name instance, copying from the source if provided"""
BaseObject.__init__(self)
if data: if data:
(privacy,source_list,note,date, (privacy,source_list,note,date,
self.first_name,self.surname,self.suffix,self.title, self.first_name,self.surname,self.suffix,self.title,
@ -123,7 +125,7 @@ class Name(PrivacyBase,SourceBase,NoteBase,DateBase):
self.first_name,self.surname,self.suffix,self.title, self.first_name,self.surname,self.suffix,self.title,
self.type,self.prefix,self.patronymic,self.sname, self.type,self.prefix,self.patronymic,self.sname,
self.group_as,self.sort_as,self.display_as) = data self.group_as,self.sort_as,self.display_as) = data
PrivateBase.unserialize(self,privacy) PrivacyBase.unserialize(self,privacy)
SourceBase.unserialize(self,source_list) SourceBase.unserialize(self,source_list)
NoteBase.unserialize(self,note) NoteBase.unserialize(self,note)
DateBase.unserialize(self,date) DateBase.unserialize(self,date)