Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pylint cleaning

Browse Source 
svn: r10079
This commit is contained in:
Peter Landgren 2008-02-20 15:54:41 +00:00
parent 8605ce973a
commit 2662815571
1 changed files with 52 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/rel_sv.py
View File

@ -256,7 +256,8 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
#Preceed with inlaw prefix #Preceed with inlaw prefix
result[-1] = 'svägerska' result[-1] = 'svägerska'
if len(result)>1 and len(result) % 2 == 0 and inlaw != '': if len(result)>1 and len(result) % 2 == 0 and inlaw != '':
# Correct string "-2" with genitive s and add a space to get correct Swedish, if even number in result # Correct string "-2" with genitive s and add a space to get
# correct Swedish, if even number in result
result[-2] = result[-2] + 's ' result[-2] = result[-2] + 's '
return self.pair_up(result, step) return self.pair_up(result, step)
@ -493,20 +494,6 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
rel_str = self._get_ancestors_brother(reltocommon_a, gender_b, step, inlaw) rel_str = self._get_ancestors_brother(reltocommon_a, gender_b, step, inlaw)
elif gender_b == gen.lib.Person.FEMALE: elif gender_b == gen.lib.Person.FEMALE:
rel_str = self._get_ancestors_sister(reltocommon_a, step, inlaw) rel_str = self._get_ancestors_sister(reltocommon_a, step, inlaw)
#else:
#rel_str = self._get_ancestors_brother(reltocommon_a,gender_b)
#elif Ga == 1:
# This is taken care of at Ga>Gb and Gb>Ga below
# b is niece/nephew of a
#if gender_b == gen.lib.Person.MALE:
# rel_str = self._get_nephew(Gb-1, step, inlaw)
#elif gender_b == gen.lib.Person.FEMALE:
# rel_str = self._get_niece(Gb-1, step, inlaw)
#elif Gb < len(_niece_level) and Gb < len(_nephew_level):
# rel_str = "%s eller %s" % (self._get_nephew(Gb-1, step, inlaw),
# self._get_niece(Gb-1, step, inlaw))
#else:
#rel_str = "XXXavlägsen %s-släkting eller %s släkting" % (step,inlaw)
elif Ga == Gb: elif Ga == Gb:
# a and b cousins in the same generation # a and b cousins in the same generation
rel_str = self._get_cousin(Ga-1, step, inlaw) rel_str = self._get_cousin(Ga-1, step, inlaw)