Changes to imports - part 4

svn: r20488
This commit is contained in:
Nick Hall 2012-10-02 19:59:22 +00:00
parent a5c41d0566
commit 186b27bf34
18 changed files with 72 additions and 72 deletions

View File

@ -39,7 +39,7 @@ not explicitly in the dictionary, but "netastre" is.
#-------------------------------------------------------------------------
from gramps.gen.lib import Person
import gen.relationship
import gramps.gen.relationship
#-------------------------------------------------------------------------
@ -807,7 +807,7 @@ def _get_neboda_valenciana(levela, levelb, inlaw="", step=""):
stramplada = _LEVEL_NAME_F[amplada]
return retorn+u" valenciana "+ stramplada+inlaw
class RelationshipCalculator(gen.relationship.RelationshipCalculator):
class RelationshipCalculator(gramps.gen.relationship.RelationshipCalculator):
"""
RelationshipCalculator Class
"""
@ -815,7 +815,7 @@ class RelationshipCalculator(gen.relationship.RelationshipCalculator):
INLAW = u' polític'
def __init__(self):
gen.relationship.RelationshipCalculator.__init__(self)
gramps.gen.relationship.RelationshipCalculator.__init__(self)
# kinship report
@ -1114,6 +1114,6 @@ if __name__ == "__main__":
# rel_xx.py module, and test your work with:
# python src/plugins/rel/rel_xx.py
#""
from gen.relationship import test
from gramps.gen.relationship import test
RC = RelationshipCalculator()
test(RC, True)

View File

@ -34,7 +34,7 @@ Czech-specific classes for relationships.
#-------------------------------------------------------------------------
from gramps.gen.lib import Person
import gen.relationship
import gramps.gen.relationship
#-------------------------------------------------------------------------
#
@ -73,13 +73,13 @@ _niece_level = [ "", "neteř", "praneteř", "prapraneteř", ]
#
#
#-------------------------------------------------------------------------
class RelationshipCalculator(gen.relationship.RelationshipCalculator):
class RelationshipCalculator(gramps.gen.relationship.RelationshipCalculator):
"""
RelationshipCalculator Class
"""
def __init__(self):
gen.relationship.RelationshipCalculator.__init__(self)
gramps.gen.relationship.RelationshipCalculator.__init__(self)
def get_male_cousin(self, level):
if level > len(_level_name)-1:
@ -227,6 +227,6 @@ if __name__ == "__main__":
rel_xx.py module, and test your work with:
python src/plugins/rel/rel_xx.py
"""
from gen.relationship import test
from gramps.gen.relationship import test
RC = RelationshipCalculator()
test(RC, True)

View File

@ -35,7 +35,7 @@ Specific classes for relationships.
#-------------------------------------------------------------------------
from gramps.gen.lib import Person
import gen.relationship
import gramps.gen.relationship
#-------------------------------------------------------------------------
#
@ -76,13 +76,13 @@ _niece_level = [ "", "niecen", "næstsøskendebarnet", "søsterens barnebarn", ]
#
#
#-------------------------------------------------------------------------
class RelationshipCalculator(gen.relationship.RelationshipCalculator):
class RelationshipCalculator(gramps.gen.relationship.RelationshipCalculator):
"""
RelationshipCalculator Class
"""
def __init__(self):
gen.relationship.RelationshipCalculator.__init__(self)
gramps.gen.relationship.RelationshipCalculator.__init__(self)
def get_parents(self, level):
if level > len(_parents_level)-1:
@ -199,7 +199,7 @@ if __name__ == "__main__":
rel_xx.py module, and test your work with:
python src/plugins/rel/rel_xx.py
"""
from gen.relationship import test
from gramps.gen.relationship import test
RC = RelationshipCalculator()
test(RC, True)

View File

@ -47,7 +47,7 @@ import re
#-------------------------------------------------------------------------
from gramps.gen.lib import Person
import gen.relationship
import gramps.gen.relationship
#-------------------------------------------------------------------------
#
@ -127,12 +127,12 @@ _schwippschwager = {
#
#-------------------------------------------------------------------------
class RelationshipCalculator(gen.relationship.RelationshipCalculator):
class RelationshipCalculator(gramps.gen.relationship.RelationshipCalculator):
"""
RelationshipCalculator Class
"""
def __init__(self):
gen.relationship.RelationshipCalculator.__init__(self)
gramps.gen.relationship.RelationshipCalculator.__init__(self)
def _make_roman(self, num):
roman = ''
@ -300,6 +300,6 @@ if __name__ == "__main__":
rel_xx.py module, and test your work with:
python src/plugins/rel/rel_xx.py
"""
from gen.relationship import test
from gramps.gen.relationship import test
rc = RelationshipCalculator()
test(rc, True)

View File

@ -36,7 +36,7 @@ from gramps.gen.lib import Person
MALE = Person.MALE
FEMALE = Person.FEMALE
UNKNOWN = Person.UNKNOWN
import gen.relationship
import gramps.gen.relationship
#-------------------------------------------------------------------------
#
@ -220,13 +220,13 @@ _nephews_nieces_level = [ "",
#
#
#-------------------------------------------------------------------------
class RelationshipCalculator(gen.relationship.RelationshipCalculator):
class RelationshipCalculator(gramps.gen.relationship.RelationshipCalculator):
"""
RelationshipCalculator Class
"""
def __init__(self):
gen.relationship.RelationshipCalculator.__init__(self)
gramps.gen.relationship.RelationshipCalculator.__init__(self)
def _get_step_father(self, level, inlaw=''):
"""Internal spanish method to create relation string
@ -815,6 +815,6 @@ if __name__ == "__main__":
rel_xx.py module, and test your work with:
python src/plugins/rel/rel_xx.py
"""
from gen.relationship import test
from gramps.gen.relationship import test
RC = RelationshipCalculator()
test(RC, True)

View File

@ -35,7 +35,7 @@ Specific classes for relationships.
#-------------------------------------------------------------------------
from gramps.gen.lib import Person
import gen.relationship
import gramps.gen.relationship
#-------------------------------------------------------------------------
#
@ -51,13 +51,13 @@ _parents_level = [ "", "vanhemmat", "isovanhemmat", "isoisovanhemmat",
#
#
#-------------------------------------------------------------------------
class RelationshipCalculator(gen.relationship.RelationshipCalculator):
class RelationshipCalculator(gramps.gen.relationship.RelationshipCalculator):
"""
RelationshipCalculator Class
"""
def __init__(self):
gen.relationship.RelationshipCalculator.__init__(self)
gramps.gen.relationship.RelationshipCalculator.__init__(self)
def get_cousin(self, level):
if level == 0:
@ -219,6 +219,6 @@ if __name__ == "__main__":
rel_xx.py module, and test your work with:
python src/plugins/rel/rel_xx.py
"""
from gen.relationship import test
from gramps.gen.relationship import test
RC = RelationshipCalculator()
test(RC, True)

View File

@ -33,7 +33,7 @@ French-specific classes for relationships.
#-------------------------------------------------------------------------
from gramps.gen.lib import Person
import gen.relationship
import gramps.gen.relationship
#-------------------------------------------------------------------------
@ -413,7 +413,7 @@ def get_niece(level, inlaw=""):
else:
return _NIECE_LEVEL[level] % inlaw
class RelationshipCalculator(gen.relationship.RelationshipCalculator):
class RelationshipCalculator(gramps.gen.relationship.RelationshipCalculator):
"""
RelationshipCalculator Class
"""
@ -421,7 +421,7 @@ class RelationshipCalculator(gen.relationship.RelationshipCalculator):
INLAW = u' (par alliance)'
def __init__(self):
gen.relationship.RelationshipCalculator.__init__(self)
gramps.gen.relationship.RelationshipCalculator.__init__(self)
# kinship report
@ -855,6 +855,6 @@ if __name__ == "__main__":
rel_xx.py module, and test your work with:
python src/plugins/rel/rel_xx.py
"""
from gen.relationship import test
from gramps.gen.relationship import test
RC = RelationshipCalculator()
test(RC, True)

View File

@ -33,7 +33,7 @@ Croatian-specific classes for calculating relationships and kinship names.
#-------------------------------------------------------------------------
#import gen.lib
import gen.relationship
import gramps.gen.relationship
_PARENTS = ['', 'otac i majka', 'djedovi i bake', 'pradjedovi i prabake',
'%s pradjedovi i %s prabake']
@ -149,12 +149,12 @@ def _get_uncles(gen, inlaw):
#
#-------------------------------------------------------------------------
class RelationshipCalculator(gen.relationship.RelationshipCalculator):
class RelationshipCalculator(gramps.gen.relationship.RelationshipCalculator):
"""
RelationshipCalculator Class
"""
def __init__(self):
gen.relationship.RelationshipCalculator.__init__(self)
gramps.gen.relationship.RelationshipCalculator.__init__(self)
def get_plural_relationship_string(self, gena, genb, reltocommon_a='',
reltocommon_b='', only_birth=True, in_law_a=False, in_law_b=False):
@ -193,6 +193,6 @@ if __name__ == "__main__":
# imported modules):
# export PYTHONPATH=/path/to/gramps/src
# python src/plugins/rel/rel_ru.py
from gen.relationship import test
from gramps.gen.relationship import test
RC = RelationshipCalculator()
test(RC, True)

View File

@ -35,7 +35,7 @@ Specific classes for relationships.
#-------------------------------------------------------------------------
from gramps.gen.lib import Person
import gen.relationship
import gramps.gen.relationship
#-------------------------------------------------------------------------
#
@ -55,13 +55,13 @@ _level = \
# Specific relationship functions
#
#-------------------------------------------------------------------------
class RelationshipCalculator(gen.relationship.RelationshipCalculator):
class RelationshipCalculator(gramps.gen.relationship.RelationshipCalculator):
"""
RelationshipCalculator Class
"""
def __init__(self):
gen.relationship.RelationshipCalculator.__init__(self)
gramps.gen.relationship.RelationshipCalculator.__init__(self)
def get_parents (self, level):
@ -295,6 +295,6 @@ if __name__ == "__main__":
rel_xx.py module, and test your work with:
python src/plugins/rel/rel_xx.py
"""
from gen.relationship import test
from gramps.gen.relationship import test
RC = RelationshipCalculator()
test(RC, True)

View File

@ -38,7 +38,7 @@ Italian-Specific classes for relationships.
#-------------------------------------------------------------------------
from gramps.gen.lib import Person
import gen.relationship
import gramps.gen.relationship
#-------------------------------------------------------------------------
#
@ -123,7 +123,7 @@ _niece_level = [ "", "la nipote%(step)s%(inlaw)s",
#
#
#-------------------------------------------------------------------------
class RelationshipCalculator(gen.relationship.RelationshipCalculator):
class RelationshipCalculator(gramps.gen.relationship.RelationshipCalculator):
"""
RelationshipCalculator Class
"""
@ -133,7 +133,7 @@ class RelationshipCalculator(gen.relationship.RelationshipCalculator):
STEP = ' adottiv%(gen)s'
def __init__(self):
gen.relationship.RelationshipCalculator.__init__(self)
gramps.gen.relationship.RelationshipCalculator.__init__(self)
#-------------------------------------------------------------------------
#
@ -518,6 +518,6 @@ if __name__ == "__main__":
rel_xx.py module, and test your work with:
python src/plugins/rel/rel_xx.py
"""
from gen.relationship import test
from gramps.gen.relationship import test
RC = RelationshipCalculator()
test(RC, True)

View File

@ -31,7 +31,7 @@ Specific classes for relationships.
#-------------------------------------------------------------------------
from gramps.gen.lib import Person
import gen.relationship
import gramps.gen.relationship
#-------------------------------------------------------------------------
#
@ -243,7 +243,7 @@ _uncle_level = [ "",
#
#
#-------------------------------------------------------------------------
class RelationshipCalculator(gen.relationship.RelationshipCalculator):
class RelationshipCalculator(gramps.gen.relationship.RelationshipCalculator):
"""
RelationshipCalculator Class
"""
@ -255,7 +255,7 @@ class RelationshipCalculator(gen.relationship.RelationshipCalculator):
INLAW = 'aangetrouwde '
def __init__(self):
gen.relationship.RelationshipCalculator.__init__(self)
gramps.gen.relationship.RelationshipCalculator.__init__(self)
def get_parents(self, level):
if level > len(_parents_level)-1:
@ -553,6 +553,6 @@ if __name__ == "__main__":
rel_xx.py module, and test your work with:
python src/plugins/rel/rel_xx.py
"""
from gen.relationship import test
from gramps.gen.relationship import test
RC = RelationshipCalculator()
test(RC, True)

View File

@ -35,7 +35,7 @@ Norwegian-Specific classes for relationships.
#-------------------------------------------------------------------------
from gramps.gen.lib import Person
import gen.relationship
import gramps.gen.relationship
#-------------------------------------------------------------------------
@ -53,13 +53,13 @@ _cousin_terms = _cousin_level + ["fetter", "kusine"]
#
#
#-------------------------------------------------------------------------
class RelationshipCalculator(gen.relationship.RelationshipCalculator):
class RelationshipCalculator(gramps.gen.relationship.RelationshipCalculator):
"""
RelationshipCalculator Class
"""
def __init__(self):
gen.relationship.RelationshipCalculator.__init__(self)
gramps.gen.relationship.RelationshipCalculator.__init__(self)
def get_parents(self, level):
if level == 0:
@ -262,6 +262,6 @@ if __name__ == "__main__":
rel_xx.py module, and test your work with:
python src/plugins/rel/rel_xx.py
"""
from gen.relationship import test
from gramps.gen.relationship import test
RC = RelationshipCalculator()
test(RC, True)

View File

@ -38,7 +38,7 @@ Polish-specific definitions of relationships.
#-------------------------------------------------------------------------
from gramps.gen.lib import Person
import gen.relationship
import gramps.gen.relationship
#-------------------------------------------------------------------------
@ -251,13 +251,13 @@ _niece_level_of_sisters_daughter = [ "", "siostrzenica",
#
#-------------------------------------------------------------------------
class RelationshipCalculator(gen.relationship.RelationshipCalculator):
class RelationshipCalculator(gramps.gen.relationship.RelationshipCalculator):
"""
RelationshipCalculator Class
"""
def __init__(self):
gen.relationship.RelationshipCalculator.__init__(self)
gramps.gen.relationship.RelationshipCalculator.__init__(self)
def get_son(self, level, inlaw=''):
"""
@ -923,6 +923,6 @@ if __name__ == "__main__":
rel_xx.py module, and test your work with:
python src/plugins/rel/rel_xx.py
"""
from gen.relationship import test
from gramps.gen.relationship import test
RC = RelationshipCalculator()
test(RC, True)

View File

@ -35,7 +35,7 @@ Specific classes for relationships.
#-------------------------------------------------------------------------
from gramps.gen.lib import Person
import gen.relationship
import gramps.gen.relationship
#-------------------------------------------------------------------------
#
@ -144,13 +144,13 @@ _NEPHEWS_NIECES_LEVEL = [u"", u"sobrinhos e sobrinhas",
#
#
#-------------------------------------------------------------------------
class RelationshipCalculator(gen.relationship.RelationshipCalculator):
class RelationshipCalculator(gramps.gen.relationship.RelationshipCalculator):
"""
RelationshipCalculator Class
"""
def __init__(self):
gen.relationship.RelationshipCalculator.__init__(self)
gramps.gen.relationship.RelationshipCalculator.__init__(self)
def get_male_cousin(self, level):
if level < len(_level_name_male):
@ -457,6 +457,6 @@ if __name__ == "__main__":
rel_xx.py module, and test your work with:
python src/plugins/rel/rel_xx.py
"""
from gen.relationship import test
from gramps.gen.relationship import test
RC = RelationshipCalculator()
test(RC, True)

View File

@ -34,7 +34,7 @@ Russian-specific definitions of relationships
#-------------------------------------------------------------------------
from gramps.gen.lib import Person
import gen.relationship
import gramps.gen.relationship
#-------------------------------------------------------------------------
@ -299,13 +299,13 @@ _nephews_nieces_level = [
#
#
#-------------------------------------------------------------------------
class RelationshipCalculator(gen.relationship.RelationshipCalculator):
class RelationshipCalculator(gramps.gen.relationship.RelationshipCalculator):
"""
RelationshipCalculator Class
"""
def __init__(self):
gen.relationship.RelationshipCalculator.__init__(self)
gramps.gen.relationship.RelationshipCalculator.__init__(self)
def get_parents(self, level):
if level > len(_parents_level)-1:
@ -502,6 +502,6 @@ if __name__ == "__main__":
rel_xx.py module, and test your work with:
python src/plugins/rel/rel_xx.py
"""
from gen.relationship import test
from gramps.gen.relationship import test
RC = RelationshipCalculator()
test(RC, True)

View File

@ -31,7 +31,7 @@ Slovak-specific classes for relationships.
#-------------------------------------------------------------------------
from gramps.gen.lib import Person
import gen.relationship
import gramps.gen.relationship
#-------------------------------------------------------------------------
#
@ -107,7 +107,7 @@ _nephews_nieces_level = [ "", "synovci a netere",
#
#-------------------------------------------------------------------------
class RelationshipCalculator(gen.relationship.RelationshipCalculator):
class RelationshipCalculator(gramps.gen.relationship.RelationshipCalculator):
"""
RelationshipCalculator Class
"""
@ -116,7 +116,7 @@ class RelationshipCalculator(gen.relationship.RelationshipCalculator):
def __init__(self):
gen.relationship.RelationshipCalculator.__init__(self)
gramps.gen.relationship.RelationshipCalculator.__init__(self)
# od aktívnej osoby vzhľadom k spoločnému predkovi Ga=[level]
@ -591,6 +591,6 @@ if __name__ == "__main__":
rel_xx.py module, and test your work with:
python src/plugins/rel/rel_xx.py
"""
from gen.relationship import test
from gramps.gen.relationship import test
RC = RelationshipCalculator()
test(RC, True)

View File

@ -34,7 +34,7 @@ Slovenian-specific definitions of relationships
#-------------------------------------------------------------------------
from gramps.gen.lib import Person
import gen.relationship
import gramps.gen.relationship
#-------------------------------------------------------------------------
@ -66,13 +66,13 @@ _neph_niec = [ u"", u"nečaki", u"pranečaki", u"prapranečaki" ]
#
#
#-------------------------------------------------------------------------
class RelationshipCalculator(gen.relationship.RelationshipCalculator):
class RelationshipCalculator(gramps.gen.relationship.RelationshipCalculator):
"""
RelationshipCalculator Class
"""
def __init__(self):
gen.relationship.RelationshipCalculator.__init__(self)
gramps.gen.relationship.RelationshipCalculator.__init__(self)
def getAncestor(self, level):
if level > len(_ancestors)-1:
@ -329,7 +329,7 @@ if __name__ == "__main__":
rel_xx.py module, and test your work with:
python src/plugins/rel/rel_xx.py
"""
from gen.relationship import test
from gramps.gen.relationship import test
RC = RelationshipCalculator()
test(RC, True)
#

View File

@ -37,7 +37,7 @@ Swedish-specific definitions of relationships
#-------------------------------------------------------------------------
from gramps.gen.lib import Person
import gen.relationship
import gramps.gen.relationship
#-------------------------------------------------------------------------
@ -67,7 +67,7 @@ u"artonde", u"nittonde", u"tjugonde" ]
#
#
#-------------------------------------------------------------------------
class RelationshipCalculator(gen.relationship.RelationshipCalculator):
class RelationshipCalculator(gramps.gen.relationship.RelationshipCalculator):
"""
RelationshipCalculator Class
"""
@ -80,7 +80,7 @@ class RelationshipCalculator(gen.relationship.RelationshipCalculator):
def __init__(self):
gen.relationship.RelationshipCalculator.__init__(self)
gramps.gen.relationship.RelationshipCalculator.__init__(self)
def _get_cousin(self, level, step, inlaw):
if level > len(_cousin_level)-1:
@ -540,6 +540,6 @@ if __name__ == "__main__":
rel_xx.py module, and test your work with:
python src/plugins/rel/rel_xx.py
"""
from gen.relationship import test
from gramps.gen.relationship import test
RC = RelationshipCalculator()
test(RC, True)